diff --git a/NuGet.config b/NuGet.config index b7da16b0568f..3aa831ad45b1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,10 +6,10 @@ - + - + @@ -17,13 +17,13 @@ - + - + @@ -50,10 +50,13 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 202d07504e98..d484ea5bdcaa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,41 +16,41 @@ - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 @@ -59,18 +59,18 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/emsdk - 8be5676af1ccf568b258133788a24aedd1a80994 + 763d10a1a251be35337ee736832bfde3f9200672 https://github.com/dotnet/emsdk - 8be5676af1ccf568b258133788a24aedd1a80994 + 763d10a1a251be35337ee736832bfde3f9200672 - + https://github.com/dotnet/emsdk - 8be5676af1ccf568b258133788a24aedd1a80994 + 763d10a1a251be35337ee736832bfde3f9200672 @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn 21192bfc323cbdd5a1f6e5dadca56ef0558c8adf - - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + af22effae4069a5dfb9b0735859de48820104f5b - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + af22effae4069a5dfb9b0735859de48820104f5b https://github.com/nuget/nuget.client @@ -231,98 +231,98 @@ - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - https://github.com/dotnet/windowsdesktop - 5307f2abc4387e29964c6f46cb1f63cfdc218602 + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 308dc7955704be60afc72ec00902cc18e028c3c2 - - https://github.com/dotnet/windowsdesktop - 5307f2abc4387e29964c6f46cb1f63cfdc218602 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 308dc7955704be60afc72ec00902cc18e028c3c2 - https://github.com/dotnet/windowsdesktop - 5307f2abc4387e29964c6f46cb1f63cfdc218602 + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 308dc7955704be60afc72ec00902cc18e028c3c2 - - https://github.com/dotnet/windowsdesktop - 5307f2abc4387e29964c6f46cb1f63cfdc218602 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 308dc7955704be60afc72ec00902cc18e028c3c2 - - https://github.com/dotnet/wpf - 375aed28c289639ec572af58067a31c3d7742ef9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf + a04736acb8edb533756131d3d5fc55f15cd03d6a - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + af22effae4069a5dfb9b0735859de48820104f5b - - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + af22effae4069a5dfb9b0735859de48820104f5b - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + af22effae4069a5dfb9b0735859de48820104f5b - - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + af22effae4069a5dfb9b0735859de48820104f5b - - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + af22effae4069a5dfb9b0735859de48820104f5b - - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + af22effae4069a5dfb9b0735859de48820104f5b - - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + af22effae4069a5dfb9b0735859de48820104f5b - - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + af22effae4069a5dfb9b0735859de48820104f5b - - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + af22effae4069a5dfb9b0735859de48820104f5b - - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + af22effae4069a5dfb9b0735859de48820104f5b - - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + af22effae4069a5dfb9b0735859de48820104f5b - - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + af22effae4069a5dfb9b0735859de48820104f5b @@ -344,20 +344,20 @@ - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + af22effae4069a5dfb9b0735859de48820104f5b - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + af22effae4069a5dfb9b0735859de48820104f5b - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + af22effae4069a5dfb9b0735859de48820104f5b - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + af22effae4069a5dfb9b0735859de48820104f5b https://github.com/dotnet/test-templates @@ -390,13 +390,13 @@ - - https://github.com/dotnet/winforms - 5f03f3d8a99d8094fd0067e2497c4ea9b440e324 + + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms + 62ebdb4b0d5cc7e163b8dc9331dc196e576bf162 - - https://github.com/dotnet/wpf - 375aed28c289639ec572af58067a31c3d7742ef9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf + a04736acb8edb533756131d3d5fc55f15cd03d6a https://github.com/dotnet/xdt @@ -504,88 +504,88 @@ - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + af22effae4069a5dfb9b0735859de48820104f5b - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 @@ -620,8 +620,8 @@ - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index d55967e3b24b..76fd1c4eb4a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -93,7 +93,7 @@ - 9.0.0-rtm.24515.14 + 9.0.0-rtm.24529.1 @@ -103,10 +103,10 @@ 9.0.0 - 9.0.0-rtm.24516.10 + 9.0.0-rtm.24528.9 9.0.0 9.0.0 - 9.0.0-rtm.24516.10 + 9.0.0-rtm.24528.9 9.0.0 9.0.0 9.0.0 @@ -114,8 +114,8 @@ 9.0.0 9.0.0 8.0.0-rc.1.23414.4 - 9.0.0-rtm.24516.10 - 9.0.0-rtm.24516.10 + 9.0.0-rtm.24528.9 + 9.0.0-rtm.24528.9 9.0.0 9.0.0 9.0.0 @@ -146,8 +146,8 @@ - 9.0.0-rtm.24516.7 - 9.0.0-rtm.24516.7 + 9.0.0-rtm.24529.2 + 9.0.0-rtm.24529.2 9.0.0 9.0.0 @@ -232,18 +232,18 @@ 9.0.0 - 9.0.0-rtm.24516.19 - 9.0.0-rtm.24516.19 - 9.0.0-rtm.24516.19 - 9.0.0-rtm.24516.19 - 9.0.0-rtm.24516.19 + 9.0.0-rtm.24529.3 + 9.0.0-rtm.24529.3 + 9.0.0-rtm.24529.3 + 9.0.0-rtm.24529.3 + 9.0.0-rtm.24529.3 9.0.0 9.0.0 - 9.0.0-rtm.24516.19 - 9.0.0-rtm.24516.19 - 9.0.0-rtm.24516.19 - 9.0.0-rtm.24516.19 - 9.0.0-rtm.24516.19 + 9.0.0-rtm.24529.3 + 9.0.0-rtm.24529.3 + 9.0.0-rtm.24529.3 + 9.0.0-rtm.24529.3 + 9.0.0-rtm.24529.3 @@ -253,8 +253,8 @@ - 9.0.0-rtm.24515.3 - 9.0.0-rtm.24515.3 + 9.0.0-rtm.24529.2 + 9.0.0-rtm.24529.2 @@ -333,7 +333,7 @@ 15.0.9600-net9-rc2 18.0.9600-net9-rc2 - 9.0.0-rtm.24515.1 + 9.0.0-rtm.24528.2 9.0.0 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) diff --git a/eng/pipelines/templates/steps/vmr-prepare.yml b/eng/pipelines/templates/steps/vmr-prepare.yml index 0a34630a5400..8cb5bae7815c 100644 --- a/eng/pipelines/templates/steps/vmr-prepare.yml +++ b/eng/pipelines/templates/steps/vmr-prepare.yml @@ -10,9 +10,12 @@ steps: displayName: Clone dotnet/dotnet path: vmr clean: true + fetchTags: true + fetchDepth: 0 - - script: | - git checkout --track origin/${{ parameters.vmrBranch }} - echo "##vso[task.setvariable variable=vmrBranch]${{ parameters.vmrBranch }}" + - powershell: | + $branchName = "${{ parameters.vmrBranch }}" -replace "refs/heads/", "" + git checkout --track origin/$branchName || exit 1 + echo "##vso[task.setvariable variable=vmrBranch]$branchName" displayName: Check out ${{ parameters.vmrBranch }} workingDirectory: $(Agent.BuildDirectory)/vmr diff --git a/eng/pipelines/vmr-build-pr-internal.yml b/eng/pipelines/vmr-build-pr-internal.yml new file mode 100644 index 000000000000..61a764d172f6 --- /dev/null +++ b/eng/pipelines/vmr-build-pr-internal.yml @@ -0,0 +1,73 @@ +# This YAML is used by these PR pipelines: +# +# - dotnet-sdk-source-build-internal +# https://dev.azure.com/dnceng/internal/_build?definitionId=1378 + +trigger: none +pr: + branches: + include: + - internal/release/* + exclude: + - internal/release/*.0.2xx + - internal/release/*.0.3xx + - internal/release/*.0.4xx + +parameters: +- name: vmrBranch + displayName: dotnet/dotnet branch to push to + type: string + default: ' ' + +- name: disableBuild + displayName: Skip the VMR Build stage + type: boolean + default: false + +variables: +- template: /eng/common/templates/variables/pool-providers.yml@self + +- ${{ if ne(parameters.vmrBranch, ' ') }}: + - name: VmrBranch + value: ${{ replace(parameters.vmrBranch, ' ', '') }} +- ${{ else }}: + - name: VmrBranch + value: ${{ replace(replace(variables['System.PullRequest.TargetBranch'], 'refs/heads/', ''), 'refs/pull/', '') }} + +# enable source-only build for pipelines with the -source-build suffix +- name: isSourceOnlyBuild + value: ${{ contains(variables['Build.DefinitionName'], '-source-build') }} + +resources: + repositories: + - repository: vmr + name: dotnet-dotnet + type: git + ref: ${{ variables.VmrBranch }} + +stages: +# You can temporarily disable the VMR Build stage by setting the disableBuild variable +- ${{ if not(parameters.disableBuild) }}: + - template: templates/stages/vmr-build.yml + parameters: + vmrBranch: ${{ variables.VmrBranch }} + isBuiltFromVmr: false + isSourceOnlyBuild: ${{ variables.isSourceOnlyBuild }} + ${{ if contains(variables['Build.DefinitionName'], '-full') }}: + scope: full + ${{ elseif eq(variables.isSourceOnlyBuild, 'true') }}: + scope: ultralite + ${{ else }}: + scope: lite + +# In case the VMR Build stage is temporarily disabled, the VMR synchronization step is run to validate +# that the PR can be merged and later synchronized into the VMR without problems. +- ${{ else }}: + - stage: Synchronize_VMR + displayName: Synchronize VMR + dependsOn: [] + jobs: + - template: templates/jobs/vmr-synchronization.yml + parameters: + vmrBranch: ${{ variables.VmrBranch }} + noPush: true diff --git a/global.json b/global.json index d2eb21c71695..d7f1244344d8 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.100-rc.2.24474.11", + "dotnet": "9.0.100", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"