diff --git a/.github/workflows/azure-static-webapp.yml b/.github/workflows/azure-static-webapp.yml index bb4027593..ab10692e2 100644 --- a/.github/workflows/azure-static-webapp.yml +++ b/.github/workflows/azure-static-webapp.yml @@ -29,7 +29,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v1.7.2 with: - dotnet-version: '9.0.100-rc.2.24474.11' + dotnet-version: '9.0.100' include-prerelease: true - run: | diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 927833bf3..43b619cb5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -132,7 +132,7 @@ stages: ApplicationBuildNumberOffset: 50 BuildCommand: build pool: - vmImage: macos-14 + vmImage: macos-15 variables: - name: SkipUnknownFrameworks @@ -145,6 +145,7 @@ stages: inputs: certSecureFile: UnoPlatform-Apple-Distribution.p12 certPwd: $(appleappstorecertificatepassword) + opensslPkcsArgs: -legacy keychain: temp # disabled because of azure devops failing to uninstall as of 2022-11-16 # deleteCert: true @@ -154,6 +155,7 @@ stages: inputs: certSecureFile: UnoPlatform-MacInstaller.p12 certPwd: $(appleappstorecertificatepassword) + opensslPkcsArgs: -legacy keychain: temp # disabled because of azure devops failing to uninstall as of 2022-11-16 # deleteCert: true diff --git a/build/build.csproj b/build/build.csproj index 3f9eef970..d6c24a188 100644 --- a/build/build.csproj +++ b/build/build.csproj @@ -131,16 +131,14 @@ + TaskFactory="RoslynCodeTaskFactory" + AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll"> - - diff --git a/build/stage-build-android-mobile.yml b/build/stage-build-android-mobile.yml index 2bd936751..d29b8a149 100644 --- a/build/stage-build-android-mobile.yml +++ b/build/stage-build-android-mobile.yml @@ -17,13 +17,13 @@ steps: cd $(build.sourcesdirectory)/Uno.Gallery dotnet publish -f:net9.0-android -p:TargetFrameworkOverride=net9.0-android -c:Release "/p:InformationalVersion=$(GitVersion.InformationalVersion)" /p:AndroidSigningKeyStore=$(keyStore.secureFilePath) /p:AndroidSigningStorePass=$(AndroidSigningStorePass) /p:AndroidSigningKeyPass=$(AndroidSigningKeyPass) /p:AndroidSigningKeyAlias=$(AndroidSigningKeyAlias) /p:AndroidKeyStore=true /bl:$(build.artifactstagingdirectory)/build-$(BuildForPlayStore).binlog displayName: 'Build Android Package' - condition: eq(variables['System.PullRequest.IsFork'],'False') + condition: and(succeeded(), eq(variables['System.PullRequest.IsFork'],'False')) - script: | cd $(build.sourcesdirectory)/Uno.Gallery dotnet publish -f:net9.0-android -p:TargetFrameworkOverride=net9.0-android -c:Release "/p:InformationalVersion=$(GitVersion.InformationalVersion)" /p:AndroidKeyStore=False /bl:$(build.artifactstagingdirectory)/build-$(BuildForPlayStore).binlog displayName: 'Build Android Package (Fork)' - condition: eq(variables['System.PullRequest.IsFork'],'True') + condition: and(succeeded(), eq(variables['System.PullRequest.IsFork'],'True')) - task: CopyFiles@2 displayName: 'Publish Android netcore Binaries' diff --git a/build/stage-build-mobile.yml b/build/stage-build-mobile.yml index 76b93a3ea..071974a01 100644 --- a/build/stage-build-mobile.yml +++ b/build/stage-build-mobile.yml @@ -16,7 +16,7 @@ steps: secureFile: nventive.jks - task: UseDotNet@2 - condition: eq(variables['IsCanaryBranch'], true) + condition: and(succeeded(), eq(variables['IsCanaryBranch'], true)) retryCountOnTaskFailure: 3 inputs: packageType: runtime @@ -29,14 +29,14 @@ steps: echo "BUILD_SOURCEBRANCH: $BUILD_SOURCEBRANCH" dotnet $(BuildCommand) -v:n -f $(BuildTargetFramework) -p:TargetFrameworkOverride=$(BuildTargetFramework) -c Release /p:ArchiveOnBuild=true /bl:$(build.artifactstagingdirectory)/build-$(BuildTargetFramework).binlog "/p:InformationalVersion=$(GitVersion.InformationalVersion)" displayName: Build project for Release - $(BuildTargetFramework) - condition: eq(variables['System.PullRequest.IsFork'],'False') + condition: and(succeeded(), eq(variables['System.PullRequest.IsFork'],'False')) - bash: | cd $(build.sourcesdirectory)/Uno.Gallery echo "BUILD_SOURCEBRANCH: $BUILD_SOURCEBRANCH" dotnet build -f $(BuildTargetFramework) -p:TargetFrameworkOverride=$(BuildTargetFramework) -c Release /bl:$(build.artifactstagingdirectory)/build-$(BuildTargetFramework).binlog "/p:InformationalVersion=$(GitVersion.InformationalVersion)" displayName: Build project for Release - $(BuildTargetFramework) - condition: eq(variables['System.PullRequest.IsFork'],'True') + condition: and(succeeded(), eq(variables['System.PullRequest.IsFork'],'True')) - task: CopyFiles@2 displayName: 'Publish Binaries' diff --git a/build/stage-build-windows.yml b/build/stage-build-windows.yml index 6fe0b3052..3e1bbf507 100644 --- a/build/stage-build-windows.yml +++ b/build/stage-build-windows.yml @@ -14,7 +14,7 @@ steps: displayName: 'Use .NET' inputs: packageType: 'sdk' - version: '9.0.100-rc.2.24474.11' + version: '9.0.100' includePreviewVersions: true - script: | diff --git a/build/templates/canary-updater.yml b/build/templates/canary-updater.yml index 0f1f63752..e92443736 100644 --- a/build/templates/canary-updater.yml +++ b/build/templates/canary-updater.yml @@ -4,7 +4,7 @@ steps: displayName: 'Use .NET' inputs: packageType: 'sdk' - version: '8.0.301' + version: '9.0.100' - task: nventiveCanaryUpdater@5 displayName: 'Canary Update (dev)' diff --git a/build/templates/dotnet-install-linux.yml b/build/templates/dotnet-install-linux.yml index abb300b2c..31e6e3247 100644 --- a/build/templates/dotnet-install-linux.yml +++ b/build/templates/dotnet-install-linux.yml @@ -1,6 +1,6 @@ parameters: - DotNetVersion: '9.0.100-rc.2.24474.11' - UnoCheck_Version: '1.27.0-dev.4' + DotNetVersion: '9.0.100' + UnoCheck_Version: '1.27.0-dev.8' installJava: true installWorkloads: true UnoCheckParameters: '' @@ -24,10 +24,10 @@ steps: sudo update-java-alternatives --set msopenjdk-11-amd64 displayName: Install OpenJDK 11 retryCountOnTaskFailure: 3 - condition: eq('${{ parameters.installJava }}', 'true') + condition: and(succeeded(), eq('${{ parameters.installJava }}', 'true')) - bash: | dotnet tool update --global uno.check --version ${{ parameters.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json uno-check --verbose --ci --non-interactive --fix --skip gtk3 --skip androidsdk --pre-major ${{ parameters.UnoCheckParameters }} displayName: Install .NET Workloads - condition: and( eq(variables['Agent.OS'], 'Linux'), eq('${{ parameters.installWorkloads }}', 'true') ) + condition: and(succeeded(), and( eq(variables['Agent.OS'], 'Linux'), eq('${{ parameters.installWorkloads }}', 'true') )) diff --git a/build/templates/dotnet-install-mac.yml b/build/templates/dotnet-install-mac.yml index e1e128d99..4830f6c53 100644 --- a/build/templates/dotnet-install-mac.yml +++ b/build/templates/dotnet-install-mac.yml @@ -1,6 +1,6 @@ parameters: - DotNetVersion: '9.0.100-rc.2.24474.11' - UnoCheck_Version: '1.27.0-dev.4' + DotNetVersion: '9.0.100' + UnoCheck_Version: '1.27.0-dev.8' installWorkloads: true UnoCheckParameters: '' @@ -31,4 +31,4 @@ steps: dotnet tool update --global uno.check --version ${{ parameters.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json uno-check --ci --non-interactive --fix --skip gtk3 --skip xcode --skip vswin --skip androidemulator --skip vsmac --pre-major ${{ parameters.UnoCheckParameters }} displayName: Install .NET Workloads - condition: and( eq(variables['Agent.OS'], 'Darwin'), eq('${{ parameters.installWorkloads }}', 'true') ) + condition: and(succeeded(), and( eq(variables['Agent.OS'], 'Darwin'), eq('${{ parameters.installWorkloads }}', 'true') )) diff --git a/build/templates/dotnet-install-windows.yml b/build/templates/dotnet-install-windows.yml index b791162da..b3ad6e3dd 100644 --- a/build/templates/dotnet-install-windows.yml +++ b/build/templates/dotnet-install-windows.yml @@ -1,6 +1,6 @@ parameters: - DotNetVersion: '9.0.100-rc.2.24474.11' - UnoCheck_Version: '1.27.0-dev.4' + DotNetVersion: '9.0.100' + UnoCheck_Version: '1.27.0-dev.8' UnoCheckParameters: '' steps: @@ -31,4 +31,4 @@ steps: errorActionPreference: continue ignoreLASTEXITCODE: true retryCountOnTaskFailure: 3 - condition: eq(variables['Agent.OS'], 'Windows_NT') + condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT')) diff --git a/build/templates/set-app-versions.yml b/build/templates/set-app-versions.yml index ac2b816d5..f2687fa8d 100644 --- a/build/templates/set-app-versions.yml +++ b/build/templates/set-app-versions.yml @@ -1,7 +1,4 @@ steps: - - task: MSBuild@1 + - pwsh: dotnet build $(Build.SourcesDirectory)/build/build.csproj /t:BuildVersion /bl:$(Build.ArtifactStagingDirectory)/set-version-build.binlog displayName: Update app versions - inputs: - solution: '$(build.sourcesdirectory)/build/build.csproj' - msbuildArguments: /r /t:BuildVersion /bl:$(build.artifactstagingdirectory)/set-version-build.binlog