From 8d27e9d722f2da55f09c2e04df9a0d1922899d72 Mon Sep 17 00:00:00 2001 From: Nick Randolph Date: Fri, 16 Feb 2024 14:04:36 +1100 Subject: [PATCH] fix: Correcting gitversion (cherry picked from commit aa86e4313ea36ca2363e0c6f078bdee079d44060) --- build/ci/.azure-pipelines.Packages.yml | 2 +- build/ci/.azure-pipelines.Wasm.yml | 2 +- build/ci/.azure-pipelines.Windows.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/ci/.azure-pipelines.Packages.yml b/build/ci/.azure-pipelines.Packages.yml index 672e5ffbd1..146de31474 100644 --- a/build/ci/.azure-pipelines.Packages.yml +++ b/build/ci/.azure-pipelines.Packages.yml @@ -44,7 +44,7 @@ jobs: msbuildLocationMethod: location msbuildLocation: $(MSBUILDPATH) msbuildArchitecture: x86 - msbuildArguments: /r /m /v:m /p:Configuration=Release "/p:PackageOutputPath=$(build.artifactstagingdirectory)\nuget" "/p:PackageVersion=$(GitVersion.FullSemVer)" "/p:InformationalVersion=%GITVERSION_InformationalVersion%" /detailedsummary /bl:$(build.artifactstagingdirectory)/uno-extensions.binlog + msbuildArguments: /r /m /v:m /p:Configuration=Release "/p:PackageOutputPath=$(build.artifactstagingdirectory)\nuget" "/p:PackageVersion=$(GitVersion.FullSemVer)" "/p:InformationalVersion=$(GITVERSION_InformationalVersion)" /detailedsummary /bl:$(build.artifactstagingdirectory)/uno-extensions.binlog clean: false maximumCpuCount: true restoreNugetPackages: false diff --git a/build/ci/.azure-pipelines.Wasm.yml b/build/ci/.azure-pipelines.Wasm.yml index d22c626256..5ad9467156 100644 --- a/build/ci/.azure-pipelines.Wasm.yml +++ b/build/ci/.azure-pipelines.Wasm.yml @@ -25,7 +25,7 @@ jobs: displayName: Use GitVersion - script: | - dotnet build testing/TestHarness/TestHarness.Wasm/TestHarness.Wasm.csproj /p:Configuration=Release "/p:InformationalVersion=%GITVERSION_InformationalVersion%" /p:UnoExtensionsDisableNet7=true /p:GeneratePackageOnBuild=false /detailedsummary /bl:$(build.artifactstagingdirectory)/testharness-wasm.binlog + dotnet build testing/TestHarness/TestHarness.Wasm/TestHarness.Wasm.csproj /p:Configuration=Release "/p:InformationalVersion=$(GITVERSION_InformationalVersion)" /p:UnoExtensionsDisableNet7=true /p:GeneratePackageOnBuild=false /detailedsummary /bl:$(build.artifactstagingdirectory)/testharness-wasm.binlog - task: CopyFiles@2 displayName: 'Publish Wasm Binaries' diff --git a/build/ci/.azure-pipelines.Windows.yml b/build/ci/.azure-pipelines.Windows.yml index 37f73a3c64..f22f317c4d 100644 --- a/build/ci/.azure-pipelines.Windows.yml +++ b/build/ci/.azure-pipelines.Windows.yml @@ -49,7 +49,7 @@ jobs: msbuildLocationMethod: location msbuildLocation: $(MSBUILDPATH) msbuildArchitecture: x86 - msbuildArguments: /m /v:m /r /p:Configuration=Release "/p:InformationalVersion=%GITVERSION_InformationalVersion%" /p:GeneratePackageOnBuild=false /p:AotAssemblies=false /p:UseWebAssemblyAOT=false /detailedsummary /bl:$(build.artifactstagingdirectory)/samples-windows-${{parameters.solutionName}}.binlog + msbuildArguments: /m /v:m /r /p:Configuration=Release "/p:InformationalVersion=$(GITVERSION_InformationalVersion)" /p:GeneratePackageOnBuild=false /p:AotAssemblies=false /p:UseWebAssemblyAOT=false /detailedsummary /bl:$(build.artifactstagingdirectory)/samples-windows-${{parameters.solutionName}}.binlog clean: false maximumCpuCount: true restoreNugetPackages: false