Merge branch 'master' into EnableNullable

# Conflicts:
#	azure-pipelines.yml
This commit is contained in:
dotMorten 2019-10-02 13:23:58 -07:00
commit 26f6271201

View file

@ -26,8 +26,6 @@ steps:
solution: '$(solution)'
platform: '$(buildPlatform)'
configuration: '$(buildConfiguration)'
msbuildArchitecture: 'x64'
msbuildArguments: '/p:JavaSdkDirectory=C:\Program Files\Android\jdk\microsoft_dist_openjdk_1.8.0.25'
- task: VSTest@2
inputs: