@@ -19,7 +19,7 @@ variables:
1919 RunningOnCI : true
2020 Build.Configuration : Release
2121 MaxJdkVersion : 8
22- DotNetCoreVersion : 6.0.x
22+ DotNetCoreVersion : 6.0.100-preview.6.21355.2
2323 HostedMacImage : macOS-10.15
2424 HostedWinVS2019 : Hosted Windows 2019 with VS2019
2525 NetCoreTargetFrameworkPathSuffix : -net6.0
5858 solution : Java.Interop.sln
5959 configuration : $(Build.Configuration)
6060 msbuildArguments : /restore
61-
61+
6262 - task : MSBuild@1
6363 displayName : MSBuild RunNUnitTests.targets
6464 inputs :
9393 runNativeDotnetTests : true
9494
9595 - template : templates\fail-on-issue.yaml
96-
96+
9797- job : mac_build
9898 displayName : Mac - Mono
9999 pool :
@@ -114,10 +114,10 @@ jobs:
114114
115115 - script : make prepare CONFIGURATION=$(Build.Configuration) JI_MAX_JDK=$(MaxJdkVersion)
116116 displayName : make prepare
117-
117+
118118 - script : make all CONFIGURATION=$(Build.Configuration) JI_MAX_JDK=$(MaxJdkVersion)
119119 displayName : make all
120-
120+
121121 - script : |
122122 r=0
123123 make run-all-tests CONFIGURATION=$(Build.Configuration) JI_MAX_JDK=$(MaxJdkVersion) || r=$?
@@ -139,7 +139,7 @@ jobs:
139139 SourceFolder : $(System.DefaultWorkingDirectory)
140140 Contents : |
141141 xatb.jar
142- bin.zip
142+ bin.zip
143143 TargetFolder : $(Build.ArtifactStagingDirectory)
144144 condition : succeededOrFailed()
145145
@@ -148,7 +148,7 @@ jobs:
148148 inputs :
149149 ArtifactName : debug
150150 condition : succeededOrFailed()
151-
151+
152152- job : mac_dotnet_build
153153 displayName : Mac - .NET Core
154154 pool :
@@ -161,12 +161,12 @@ jobs:
161161 submodules : recursive
162162
163163 - template : templates\install-dependencies.yaml
164-
164+
165165 - script : make prepare-core CONFIGURATION=$(Build.Configuration) JI_MAX_JDK=$(MaxJdkVersion)
166166 displayName : make prepare-core
167-
167+
168168 - template : templates\core-build.yaml
169-
169+
170170 - template : templates\core-tests.yaml
171171 parameters :
172172 runNativeTests : true
0 commit comments