diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 68492a1dae5c02..8edaf618678612 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,9 +111,9 @@ - + https://github.com/dotnet/arcade - f7fb1fec01b91be69e4dcc5290a0bff3f28e214f + c255aae7f2b128fa20a4441f0e192c3c53561621 @@ -121,69 +121,69 @@ 73f0850939d96131c28cf6ea6ee5aacb4da0083a - + https://github.com/dotnet/arcade - f7fb1fec01b91be69e4dcc5290a0bff3f28e214f + c255aae7f2b128fa20a4441f0e192c3c53561621 - + https://github.com/dotnet/arcade - f7fb1fec01b91be69e4dcc5290a0bff3f28e214f + c255aae7f2b128fa20a4441f0e192c3c53561621 - + https://github.com/dotnet/arcade - f7fb1fec01b91be69e4dcc5290a0bff3f28e214f + c255aae7f2b128fa20a4441f0e192c3c53561621 - + https://github.com/dotnet/arcade - f7fb1fec01b91be69e4dcc5290a0bff3f28e214f + c255aae7f2b128fa20a4441f0e192c3c53561621 - + https://github.com/dotnet/arcade - f7fb1fec01b91be69e4dcc5290a0bff3f28e214f + c255aae7f2b128fa20a4441f0e192c3c53561621 - + https://github.com/dotnet/arcade - f7fb1fec01b91be69e4dcc5290a0bff3f28e214f + c255aae7f2b128fa20a4441f0e192c3c53561621 - + https://github.com/dotnet/arcade - f7fb1fec01b91be69e4dcc5290a0bff3f28e214f + c255aae7f2b128fa20a4441f0e192c3c53561621 - + https://github.com/dotnet/arcade - f7fb1fec01b91be69e4dcc5290a0bff3f28e214f + c255aae7f2b128fa20a4441f0e192c3c53561621 - + https://github.com/dotnet/arcade - f7fb1fec01b91be69e4dcc5290a0bff3f28e214f + c255aae7f2b128fa20a4441f0e192c3c53561621 - + https://github.com/dotnet/arcade - f7fb1fec01b91be69e4dcc5290a0bff3f28e214f + c255aae7f2b128fa20a4441f0e192c3c53561621 - + https://github.com/dotnet/arcade - f7fb1fec01b91be69e4dcc5290a0bff3f28e214f + c255aae7f2b128fa20a4441f0e192c3c53561621 - + https://github.com/dotnet/arcade - f7fb1fec01b91be69e4dcc5290a0bff3f28e214f + c255aae7f2b128fa20a4441f0e192c3c53561621 - + https://github.com/dotnet/arcade - f7fb1fec01b91be69e4dcc5290a0bff3f28e214f + c255aae7f2b128fa20a4441f0e192c3c53561621 - + https://github.com/dotnet/arcade - f7fb1fec01b91be69e4dcc5290a0bff3f28e214f + c255aae7f2b128fa20a4441f0e192c3c53561621 - + https://github.com/dotnet/arcade - f7fb1fec01b91be69e4dcc5290a0bff3f28e214f + c255aae7f2b128fa20a4441f0e192c3c53561621 - + https://github.com/dotnet/arcade - f7fb1fec01b91be69e4dcc5290a0bff3f28e214f + c255aae7f2b128fa20a4441f0e192c3c53561621 https://github.com/dotnet/runtime-assets @@ -334,9 +334,9 @@ https://github.com/dotnet/xharness 8c90d68ba97c7ee54d09fccb854f77ed0f9419ef - + https://github.com/dotnet/arcade - f7fb1fec01b91be69e4dcc5290a0bff3f28e214f + c255aae7f2b128fa20a4441f0e192c3c53561621 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 9226aa267a05a7..7a5a1d61b7bb35 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -87,21 +87,21 @@ 8.0.100 - 8.0.0-beta.24516.1 - 8.0.0-beta.24516.1 - 8.0.0-beta.24516.1 - 8.0.0-beta.24516.1 - 8.0.0-beta.24516.1 - 2.5.1-beta.24516.1 - 8.0.0-beta.24516.1 - 8.0.0-beta.24516.1 - 8.0.0-beta.24516.1 - 8.0.0-beta.24516.1 - 8.0.0-beta.24516.1 - 8.0.0-beta.24516.1 - 8.0.0-beta.24516.1 - 8.0.0-beta.24516.1 - 8.0.0-beta.24516.1 + 8.0.0-beta.25060.1 + 8.0.0-beta.25060.1 + 8.0.0-beta.25060.1 + 8.0.0-beta.25060.1 + 8.0.0-beta.25060.1 + 2.5.1-beta.25060.1 + 8.0.0-beta.25060.1 + 8.0.0-beta.25060.1 + 8.0.0-beta.25060.1 + 8.0.0-beta.25060.1 + 8.0.0-beta.25060.1 + 8.0.0-beta.25060.1 + 8.0.0-beta.25060.1 + 8.0.0-beta.25060.1 + 8.0.0-beta.25060.1 6.0.0-preview.1.102 diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index 0117328800c870..b2ccd9df68010e 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -86,7 +86,7 @@ jobs: arguments: > -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' - /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com + /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:OfficialBuildId=$(Build.BuildNumber) condition: ${{ parameters.condition }} diff --git a/eng/common/templates-official/post-build/common-variables.yml b/eng/common/templates-official/post-build/common-variables.yml index c24193acfc981f..173914f2364a70 100644 --- a/eng/common/templates-official/post-build/common-variables.yml +++ b/eng/common/templates-official/post-build/common-variables.yml @@ -7,7 +7,7 @@ variables: # Default Maestro++ API Endpoint and API Version - name: MaestroApiEndPoint - value: "https://maestro-prod.westus2.cloudapp.azure.com" + value: "https://maestro.dot.net" - name: MaestroApiAccessToken value: $(MaestroAccessToken) - name: MaestroApiVersion diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 8ec5c4f2d9f910..e295031c0985e9 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -128,7 +128,7 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - task: MicroBuildSigningPlugin@3 + - task: MicroBuildSigningPlugin@4 displayName: Install MicroBuild plugin inputs: signType: $(_SignType) diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index a2dedaa5297a7e..60352ede194ec3 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -321,7 +321,7 @@ function InstallDotNet([string] $dotnetRoot, $variations += @($installParameters) $dotnetBuilds = $installParameters.Clone() - $dotnetbuilds.AzureFeed = "https://dotnetbuilds.azureedge.net/public" + $dotnetbuilds.AzureFeed = "https://ci.dot.net/public" $variations += @($dotnetBuilds) if ($runtimeSourceFeed) { diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 3392e3a99921f7..b9b329ce37fff4 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -234,7 +234,7 @@ function InstallDotNet { local public_location=("${installParameters[@]}") variations+=(public_location) - local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://dotnetbuilds.azureedge.net/public") + local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://ci.dot.net/public") variations+=(dotnetbuilds) if [[ -n "${6:-}" ]]; then diff --git a/global.json b/global.json index 4aea1744d82984..6abaf940387f48 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.110" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24516.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24516.1", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.24516.1", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25060.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25060.1", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.25060.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6"