diff --git a/.vsts-ci.yml b/.vsts-ci.yml index d738608e37ae..5ff63a0b843c 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -42,7 +42,7 @@ stages: agentOs: Windows_NT pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Svc-Public + name: NetCore-Svc-Public demands: ImageOverride -equals build.windows.10.amd64.vs2017.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal @@ -99,7 +99,7 @@ stages: agentOs: Linux pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Svc-Public + name: NetCore-Svc-Public demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal @@ -314,27 +314,3 @@ stages: -TsaRepositoryName "dotnet-installer" -TsaCodebaseName "dotnet-installer" -TsaPublish $True' - -- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), not(contains(variables['Build.SourceBranch'], 'refs/heads/internal/'))) }}: - - stage: copy_to_latest - displayName: Copy to latest - dependsOn: - # This will run only after all the publishing stages have run. - # These stages are introduced in the eng/common/templates/post-build/channels YAML templates - - publish_using_darc - jobs: - - job: Copy_SDK_To_Latest - pool: - name: Hosted VS2017 - condition: succeeded() - variables: - - group: DotNet-DotNetCli-Storage - steps: - - script: eng/CopyToLatest.cmd - /p:OfficialBuildId=$(BUILD.BUILDNUMBER) - /p:DotnetPublishSdkAssetsBlobFeedUrl=https://dotnetcli.blob.core.windows.net/dotnet/index.json - /p:DotNetPublishSdkAssetsBlobFeedKey=$(dotnetcli-storage-key) - /p:DotnetPublishChecksumsBlobFeedUrl=https://dotnetclichecksums.blob.core.windows.net/dotnet/index.json - /p:DotNetPublishChecksumsBlobFeedKey=$(dotnetclichecksums-storage-key) - /p:SourceBranch=$(BUILD.SOURCEBRANCH) - displayName: Copy to latest diff --git a/NuGet.config b/NuGet.config index 99e960ae9a3e..8eff0d9902a6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,18 +7,14 @@ - - - - @@ -38,16 +34,12 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 60c151e2768f..655720cfd394 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -144,13 +144,13 @@ - + https://github.com/dotnet/arcade - ee744068a4fcccc5b8b56e0025f9c95aa19ff318 + 09c06ff884d0e3e64114d5b973ce6514045d4fcd - + https://github.com/dotnet/arcade - ee744068a4fcccc5b8b56e0025f9c95aa19ff318 + 09c06ff884d0e3e64114d5b973ce6514045d4fcd https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 7410533a46a9..56c58f779e9b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 5.0.0-beta.22159.5 + 5.0.0-beta.22506.2 diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 435e7641341b..7df4726cb268 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -10,8 +10,7 @@ param ( function InstallDarcCli ($darcVersion, $toolpath) { $darcCliPackageName = 'microsoft.dotnet.darc' - $dotnetRoot = InitializeDotNetCli -install:$true - $dotnet = "$dotnetRoot\dotnet.exe" + $dotnet = "dotnet" $toolList = & "$dotnet" tool list -g if ($toolList -like "*$darcCliPackageName*") { diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 1b0af40d52f4..aaeacddce1e1 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -184,6 +184,7 @@ stages: arguments: -task SigningValidation -restore -msbuildEngine vs /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' + /p:CheckEolTargetFramework=false ${{ parameters.signingValidationAdditionalParameters }} - template: ../steps/publish-logs.yml @@ -258,7 +259,14 @@ stages: - name: BARBuildId value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] pool: - vmImage: 'windows-2019' + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: VSEngSS-MicroBuild2022-1ES + demands: Cmd + # If it's not devdiv, it's dnceng + ${{ else }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals 1es-windows-2022 steps: - task: PowerShell@2 displayName: Publish Using Darc diff --git a/global.json b/global.json index c1ff48bad8f3..77d45929ff41 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "5.0.401", + "dotnet": "5.0.408", "runtimes": { "dotnet": [ "$(MicrosoftNETCoreAppInternalPackageVersion)" @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.22159.5" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.22506.2" } }