diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 59526b0cabf6..3f9a080122ab 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -369,15 +369,18 @@ stages: parameters: vmrBranch: ${{ parameters.vmrBranch }} +# TODO: Disable source-build builds in PR validation until source-build is more sustainable +# Tracking issue: https://github.com/dotnet/source-build/issues/3214 +# # In case the VMR Build stage needs to be temporarily disabled, please make sure that # the VMR synchronization step is run to validate that the PR can be merged and later # synchronized into the VMR without problems. # You can do this by allowing the Synchronize_VMR stage from above in PRs. -- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: - - template: eng/pipelines/templates/stages/vmr-build.yml - parameters: - vmrBranch: ${{ parameters.vmrBranch }} - isBuiltFromVmr: false +# - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: +# - template: eng/pipelines/templates/stages/vmr-build.yml +# parameters: +# vmrBranch: ${{ parameters.vmrBranch }} +# isBuiltFromVmr: false - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - stage: Publish diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e57da6807ac..e110ea97e762 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - db5fe27134fa1d9a60794d00831ba3449db1e800 + 442b754813fbe55e1f2a55969da4ca1d42a651da - + https://github.com/dotnet/windowsdesktop - db5fe27134fa1d9a60794d00831ba3449db1e800 + 442b754813fbe55e1f2a55969da4ca1d42a651da - + https://github.com/dotnet/windowsdesktop - db5fe27134fa1d9a60794d00831ba3449db1e800 + 442b754813fbe55e1f2a55969da4ca1d42a651da - + https://github.com/dotnet/windowsdesktop - db5fe27134fa1d9a60794d00831ba3449db1e800 + 442b754813fbe55e1f2a55969da4ca1d42a651da - + https://github.com/dotnet/runtime - 5da4a9e919dcee35f831ab69b6e475baaf798875 + 2908445dae75580421a3585a45ba3d570bd75cd3 - + https://github.com/dotnet/runtime - 5da4a9e919dcee35f831ab69b6e475baaf798875 + 2908445dae75580421a3585a45ba3d570bd75cd3 - + https://github.com/dotnet/runtime - 5da4a9e919dcee35f831ab69b6e475baaf798875 + 2908445dae75580421a3585a45ba3d570bd75cd3 - + https://github.com/dotnet/runtime - 5da4a9e919dcee35f831ab69b6e475baaf798875 + 2908445dae75580421a3585a45ba3d570bd75cd3 - + https://github.com/dotnet/runtime - 5da4a9e919dcee35f831ab69b6e475baaf798875 + 2908445dae75580421a3585a45ba3d570bd75cd3 - + https://github.com/dotnet/runtime - 5da4a9e919dcee35f831ab69b6e475baaf798875 + 2908445dae75580421a3585a45ba3d570bd75cd3 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 5da4a9e919dcee35f831ab69b6e475baaf798875 + 2908445dae75580421a3585a45ba3d570bd75cd3 - + https://github.com/dotnet/aspnetcore - cefc6ccf4b23ac9f07418cd10e374cf533276eee + 6f1752a798a9460b8a039750e30b827578528c90 - + https://github.com/dotnet/aspnetcore - cefc6ccf4b23ac9f07418cd10e374cf533276eee + 6f1752a798a9460b8a039750e30b827578528c90 - + https://github.com/dotnet/aspnetcore - cefc6ccf4b23ac9f07418cd10e374cf533276eee + 6f1752a798a9460b8a039750e30b827578528c90 - + https://github.com/dotnet/aspnetcore - cefc6ccf4b23ac9f07418cd10e374cf533276eee + 6f1752a798a9460b8a039750e30b827578528c90 - + https://github.com/dotnet/aspnetcore - cefc6ccf4b23ac9f07418cd10e374cf533276eee + 6f1752a798a9460b8a039750e30b827578528c90 - + https://github.com/dotnet/aspnetcore - cefc6ccf4b23ac9f07418cd10e374cf533276eee + 6f1752a798a9460b8a039750e30b827578528c90 - + https://github.com/dotnet/aspnetcore - cefc6ccf4b23ac9f07418cd10e374cf533276eee + 6f1752a798a9460b8a039750e30b827578528c90 https://github.com/dotnet/test-templates @@ -102,60 +102,60 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 7a21ca118f165bc921d53f97c7c78517b874942f + 6f513040ff1e3ecf05f3e9c0bfd5e5a342aa16ff - + https://github.com/dotnet/sdk - 7a21ca118f165bc921d53f97c7c78517b874942f + 6f513040ff1e3ecf05f3e9c0bfd5e5a342aa16ff - + https://github.com/dotnet/sdk - 7a21ca118f165bc921d53f97c7c78517b874942f + 6f513040ff1e3ecf05f3e9c0bfd5e5a342aa16ff - + https://github.com/dotnet/sdk - 7a21ca118f165bc921d53f97c7c78517b874942f + 6f513040ff1e3ecf05f3e9c0bfd5e5a342aa16ff - + https://github.com/dotnet/winforms - 5bf0934bd4a59e381fef7b0905f65a14aa1a3400 + df4f6da7f2aed3469994153456246690aed9de94 - + https://github.com/dotnet/wpf - d3acd59aff00e82c78051a565f114eaab417cdbc + 6eb9ccdb28ba0c26e2253dbd744457abe0c1150b - + https://github.com/dotnet/fsharp - 8fdf58a63cc05a964a57f66a4ab8924984c13042 + 679719f94009d61e28df5c3b5ec87f1448c803e9 - + https://github.com/dotnet/fsharp - 8fdf58a63cc05a964a57f66a4ab8924984c13042 + 679719f94009d61e28df5c3b5ec87f1448c803e9 - + https://github.com/microsoft/vstest - acd1eca1e1b690c2899b518c52ffe1501a8d05dc + 5e9c3debd9d0007c53e7510ac030ea5e8fc483f4 - + https://github.com/dotnet/linker - 4b3f78cbc7284b4198652a695e9fe0267133728e + 44520382eda0c82c5a4d3f38d3f59965f3ba90b0 linker - + https://github.com/dotnet/roslyn - e5390ea70c8cb9dbda25a9fb58abe0fc8eea1521 + 7061c64ddbd931d55b9a97f95243fcf91d04d7b1 - + https://github.com/dotnet/msbuild - d89d4bc91a0c4cf5087c4a0ed2e88b03407eba97 + 7711999070e51442c3e527f576159828f01cb3bf diff --git a/eng/Versions.props b/eng/Versions.props index 2bcc5277a347..879e7d1aa526 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,11 +34,11 @@ - 8.0.0-alpha.1.23055.7 + 8.0.0-alpha.1.23062.3 - 8.0.0-alpha.1.23056.2 + 8.0.0-alpha.1.23063.1 @@ -58,46 +58,46 @@ - 8.0.0-alpha.1.23058.7 - 8.0.0-alpha.1.23058.7 - 8.0.0-alpha.1.23058.7 - 8.0.0-alpha.1.23058.7 - 8.0.0-alpha.1.23058.7 - 8.0.0-alpha.1.23058.7 - 8.0.0-alpha.1.23058.7 + 8.0.0-alpha.1.23066.6 + 8.0.0-alpha.1.23066.6 + 8.0.0-alpha.1.23066.6 + 8.0.0-alpha.1.23066.6 + 8.0.0-alpha.1.23066.6 + 8.0.0-alpha.1.23066.6 + 8.0.0-alpha.1.23066.6 0.2.0 - 8.0.100-alpha.1.23059.3 - 8.0.100-alpha.1.23059.3 - 8.0.100-alpha.1.23059.3 + 8.0.100-alpha.1.23067.9 + 8.0.100-alpha.1.23067.9 + 8.0.100-alpha.1.23067.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-alpha.1.23058.2 + 8.0.0-alpha.1.23065.5 - 8.0.0-alpha.1.23058.2 - 8.0.0-alpha.1.23058.2 - 8.0.0-alpha.1.23058.2 - 8.0.0-alpha.1.23058.2 - 8.0.0-alpha.1.23058.2 - 8.0.0-alpha.1.23058.2 + 8.0.0-alpha.1.23065.5 + 8.0.0-alpha.1.23065.5 + 8.0.0-alpha.1.23065.5 + 8.0.0-alpha.1.23065.5 + 8.0.0-alpha.1.23065.5 + 8.0.0-alpha.1.23065.5 2.1.0 - 8.0.0-alpha.1.23057.1 - 8.0.0-alpha.1.23057.1 - 8.0.0-alpha.1.23057.1 - 8.0.0-alpha.1.23057.1 + 8.0.0-alpha.1.23064.1 + 8.0.0-alpha.1.23064.1 + 8.0.0-alpha.1.23064.1 + 8.0.0-alpha.1.23064.1 @@ -187,7 +187,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230107-01 + 17.6.0-preview-20230117-02 8.0.0-alpha.1.22557.12 diff --git a/global.json b/global.json index eab1b13e7a12..73908c56dd8e 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-alpha.1.22423.9", + "dotnet": "8.0.100-alpha.1.23061.8", "runtimes": { "dotnet": [ "7.0.0" diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index fce77b6a182c..563dc164c2c5 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-alpha.1.22579.5" + "dotnet": "8.0.100-alpha.1.23061.8" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", diff --git a/src/SourceBuild/content/repo-projects/linker.proj b/src/SourceBuild/content/repo-projects/linker.proj index eb0fecf74ef5..db14ef0988ab 100644 --- a/src/SourceBuild/content/repo-projects/linker.proj +++ b/src/SourceBuild/content/repo-projects/linker.proj @@ -10,10 +10,14 @@ $(StandardSourceBuildCommand) $(BuildCommandArgs) false - $(ProjectDirectory)NuGet.config true + + + + +