@@ -17,7 +17,6 @@ variables:
17
17
PathToSamplesSln : ' samples/XCT.Sample.sln'
18
18
PathToCommunityToolkitUnitTestCsproj : ' src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/Xamarin.CommunityToolkit.UnitTests.csproj'
19
19
PathToMarkupUnitTestCsproj : ' src/Markup/Xamarin.CommunityToolkit.Markup.UnitTests/Xamarin.CommunityToolkit.Markup.UnitTests.csproj'
20
- PathToMsBuildOnMacOS : ' mono /Applications/Visual\ studio.app/Contents/Resources/lib/monodevelop/bin/MSBuild/Current/bin/MSBuild.dll'
21
20
Codeql.Enabled : true
22
21
23
22
resources :
@@ -349,16 +348,35 @@ jobs:
349
348
version : $(NETCORE_TEST_VERSION_2_1)
350
349
includePreviewVersions : false
351
350
352
- - task : CmdLine@2
353
- displayName : ' Build Markup'
351
+ # restore, build and pack the packages
352
+ - task : MSBuild@1
353
+ displayName : Build Xamarin.CommunityToolkit.csproj
354
354
inputs :
355
- script : ' $(PathToMsBuildOnMacOS) $(PathToMarkupCsproj) /p:Configuration=Release /restore /t:Build /p:ContinuousIntegrationBuild=true /p:Deterministic=false'
356
-
357
- - task : CmdLine@2
358
- displayName : ' Build Community Toolkit'
355
+ solution : $(PathToCommunityToolkitCsproj)
356
+ configuration : Release
357
+ msbuildArguments : ' /restore /t:Build /p:ContinuousIntegrationBuild=true /p:Deterministic=false'
358
+
359
+ - task : MSBuild@1
360
+ displayName : Pack Community Toolkit NuGets
359
361
inputs :
360
- script : ' $(PathToMsBuildOnMacOS) $(PathToCommunityToolkitCsproj) /p:Configuration=Release /restore /t:Build /p:ContinuousIntegrationBuild=true /p:Deterministic=false'
361
-
362
+ solution : $(PathToCommunityToolkitCsproj)
363
+ configuration : Release
364
+ msbuildArguments : ' /t:Pack /p:PackageVersion=$(NugetPackageVersion)'
365
+
366
+ - task : MSBuild@1
367
+ displayName : Build Markup Project
368
+ inputs :
369
+ solution : $(PathToMarkupCsproj)
370
+ configuration : Release
371
+ msbuildArguments : ' /restore /t:Build /p:ContinuousIntegrationBuild=true /p:Deterministic=false'
372
+
373
+ - task : MSBuild@1
374
+ displayName : Pack Markup NuGet
375
+ inputs :
376
+ solution : $(PathToMarkupCsproj)
377
+ configuration : Release
378
+ msbuildArguments : ' /t:Pack /p:PackageVersion=$(NugetPackageVersion)'
379
+
362
380
- task : CmdLine@2
363
381
displayName : ' Run Markup Unit Tests'
364
382
inputs :
@@ -368,16 +386,6 @@ jobs:
368
386
displayName : ' Run Community Toolkit Unit Tests'
369
387
inputs :
370
388
script : ' dotnet test $(PathToCommunityToolkitUnitTestCsproj) -c Release -p:BuildInParallel=false'
371
-
372
- - task : CmdLine@2
373
- displayName : ' Pack Markup NuGets'
374
- inputs :
375
- script : ' $(PathToMsBuildOnMacOS) $(PathToMarkupUnitTestCsproj) /p:Configuration=Release /t:Pack /p:PackageVersion=$(NugetPackageVersion)'
376
-
377
- - task : CmdLine@2
378
- displayName : ' Pack CommunityToolkit NuGets'
379
- inputs :
380
- script : ' $(PathToMsBuildOnMacOS) $(PathToCommunityToolkitCsproj) /p:Configuration=Release /t:Pack /p:PackageVersion=$(NugetPackageVersion)'
381
389
382
390
- ${{ if eq(variables['System.TeamProject'], 'devdiv') }} :
383
391
- template : sign-artifacts/jobs/v2.yml@internal-templates
0 commit comments