diff --git a/NuGet.config b/NuGet.config index c4a66fb15..9d7ecd6e6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,42 +7,31 @@ - - - - - + - - - - - + + + + - - - - - + - - - - - + + + + - - - - - + + + + @@ -63,32 +52,22 @@ - - - - - + - - - - - + - - - - - + + + + - - - - - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ddf7ced64..f3296ed9a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef2ca68feb305bd9ebc3934b8488526caee3d118 + db4e5a36567b85765753af097e878d894a3552c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef2ca68feb305bd9ebc3934b8488526caee3d118 + db4e5a36567b85765753af097e878d894a3552c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef2ca68feb305bd9ebc3934b8488526caee3d118 + db4e5a36567b85765753af097e878d894a3552c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef2ca68feb305bd9ebc3934b8488526caee3d118 + db4e5a36567b85765753af097e878d894a3552c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e77011b31a3e5c47d931248a64b47f9b2d47853d + 6c636980f730a30c3f5352cff80ce035ae53f016 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e77011b31a3e5c47d931248a64b47f9b2d47853d + 6c636980f730a30c3f5352cff80ce035ae53f016 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e77011b31a3e5c47d931248a64b47f9b2d47853d + 6c636980f730a30c3f5352cff80ce035ae53f016 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e77011b31a3e5c47d931248a64b47f9b2d47853d + 6c636980f730a30c3f5352cff80ce035ae53f016 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e77011b31a3e5c47d931248a64b47f9b2d47853d + 6c636980f730a30c3f5352cff80ce035ae53f016 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e77011b31a3e5c47d931248a64b47f9b2d47853d + 6c636980f730a30c3f5352cff80ce035ae53f016 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fedc545ce86467b7d3413d906f1ab02fb3db12ff + f0f9de5692adf1c0576de062f93c6ab7b176433f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fedc545ce86467b7d3413d906f1ab02fb3db12ff + f0f9de5692adf1c0576de062f93c6ab7b176433f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fedc545ce86467b7d3413d906f1ab02fb3db12ff + f0f9de5692adf1c0576de062f93c6ab7b176433f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fedc545ce86467b7d3413d906f1ab02fb3db12ff + f0f9de5692adf1c0576de062f93c6ab7b176433f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fedc545ce86467b7d3413d906f1ab02fb3db12ff + f0f9de5692adf1c0576de062f93c6ab7b176433f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fedc545ce86467b7d3413d906f1ab02fb3db12ff + f0f9de5692adf1c0576de062f93c6ab7b176433f https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 89f5155bcd844b1a02d2be6b17caa0fb2dcf17bc + 8413a0dffce5dd2f6d53d6156e25f3bf649da60b - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 89f5155bcd844b1a02d2be6b17caa0fb2dcf17bc + 8413a0dffce5dd2f6d53d6156e25f3bf649da60b - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 89f5155bcd844b1a02d2be6b17caa0fb2dcf17bc + 8413a0dffce5dd2f6d53d6156e25f3bf649da60b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d1ba1897fb2799cf7a51bab3492c933a4fdad702 + 7f9bab3b70e32ae000f8b6bc20e3a9d6bd4502ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d1ba1897fb2799cf7a51bab3492c933a4fdad702 + 7f9bab3b70e32ae000f8b6bc20e3a9d6bd4502ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 670045968593e524941ef480423796ceb50c5e2f + 6a984c48f3489b60f25deb72ede6e5051bb130d4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 798cc6d4922db482f84fb72a8244f0da898bc5d6 + b660c1e83039451abe9d9190a7aabe87c03fd7ae https://github.com/dotnet/fsharp @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 8601068126449af799f8e07ca358dbbd4b3fcab4 + 849e1a63a8319f9578b9e5f02da592d24d4aa2df https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 4b3fa78e8..34bf8a76e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.32-servicing.24314.5 + 6.0.33-servicing.24366.4 - 6.0.32-servicing.24314.4 + 6.0.33-servicing.24366.5 - 6.0.424 + 6.0.425 @@ -43,20 +43,20 @@ - 6.0.32 - 6.0.32 - 6.0.32-servicing.24314.5 - 6.0.32-servicing.24314.5 - 6.0.32-servicing.24314.5 - 6.0.32-servicing.24314.5 + 6.0.33 + 6.0.33 + 6.0.33-servicing.24379.5 + 6.0.33-servicing.24379.5 + 6.0.33-servicing.24379.5 + 6.0.33-servicing.24379.5 0.2.0 - 6.0.424-servicing.24315.2 - 6.0.424-servicing.24315.2 + 6.0.425-servicing.24379.11 + 6.0.425-servicing.24379.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -67,20 +67,20 @@ - 6.0.32-servicing.24314.7 - 6.0.32-servicing.24314.7 - 6.0.32 - 6.0.32 - 6.0.32 - 6.0.32 + 6.0.33-servicing.24366.10 + 6.0.33-servicing.24366.10 + 6.0.33 + 6.0.33 + 6.0.33 + 6.0.33 2.1.0 - 6.0.32-servicing.24314.6 - 6.0.32-servicing.24314.6 - 6.0.32 - 6.0.32 + 6.0.33-servicing.24366.6 + 6.0.33-servicing.24366.6 + 6.0.33 + 6.0.33 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.424 + 6.0.425 $(MicrosoftAspNetCoreAppRuntimePackageVersion) @@ -155,7 +155,7 @@ 12.3.303 15.4.303 6.0.5 - 6.0.32 + 6.0.33 $(MicrosoftNETWorkloadEmscriptenManifest60400Version) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml index 8b5b456b6..2e4867a58 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml @@ -42,6 +42,7 @@ jobs: arguments: $(Build.SourcesDirectory)/NuGet.config $Token env: Token: $(dn-bot-dnceng-artifact-feeds-rw) + - template: /eng/common/templates-official/steps/enable-internal-runtimes.yml - script: | set -x df -h