diff --git a/NuGet.config b/NuGet.config index 043f28d3b..dfabbd633 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,20 @@ - + - + - + - - + @@ -42,16 +41,15 @@ - + - + - + - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ba865110..e812a0193 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bde268e756b9e5b8240cce27114a150e9f61967e + 44b3a005f161dfc735446e61cbf1e792124170da - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bde268e756b9e5b8240cce27114a150e9f61967e + 44b3a005f161dfc735446e61cbf1e792124170da - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bde268e756b9e5b8240cce27114a150e9f61967e + 44b3a005f161dfc735446e61cbf1e792124170da - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - bde268e756b9e5b8240cce27114a150e9f61967e + 44b3a005f161dfc735446e61cbf1e792124170da - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + c76ac565499f3e7c657126d46c00b67a0d74832c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + c76ac565499f3e7c657126d46c00b67a0d74832c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + c76ac565499f3e7c657126d46c00b67a0d74832c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + c76ac565499f3e7c657126d46c00b67a0d74832c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + c76ac565499f3e7c657126d46c00b67a0d74832c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + c76ac565499f3e7c657126d46c00b67a0d74832c @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + c76ac565499f3e7c657126d46c00b67a0d74832c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + be51b1aa73343e45a1d00afd436abad794f471fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + be51b1aa73343e45a1d00afd436abad794f471fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + be51b1aa73343e45a1d00afd436abad794f471fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + be51b1aa73343e45a1d00afd436abad794f471fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + be51b1aa73343e45a1d00afd436abad794f471fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d6f154cca3863703cf87c8b840eea9cbe20229b2 + be51b1aa73343e45a1d00afd436abad794f471fb https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3dcf1890238ad2d1685b4d45f361634f69d1ddc1 + 61b9e8db59eccd3a3a20b247a54896dd977e134d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3dcf1890238ad2d1685b4d45f361634f69d1ddc1 + 61b9e8db59eccd3a3a20b247a54896dd977e134d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3dcf1890238ad2d1685b4d45f361634f69d1ddc1 + 61b9e8db59eccd3a3a20b247a54896dd977e134d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 66e869d7ab5ae253fa3a4e3bca9046c387ee12a9 + 0916fe56744d1c533e4a15aaa7293e6fa7b92b99 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 66e869d7ab5ae253fa3a4e3bca9046c387ee12a9 + 0916fe56744d1c533e4a15aaa7293e6fa7b92b99 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 357cdc523d68fa9f5eb1b96f4b5a113ffa92d76d + 865895cec5e8dc357b65c98a4a7af58643d10997 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 8f6fa2d5a7ef6c9fdfe6452ce35ca4bd17cf3f55 + a29a62bc7aa91d9e7509261a138af3c27c0506ea https://github.com/dotnet/fsharp @@ -130,9 +130,9 @@ 702b8e77f5fbfe21e6743324c1750503e02f182d - + https://github.com/microsoft/vstest - 0c34747ff62ec59acb1579dfea5377acaf54027d + 5948b392c5d8c2580d08c9f6570409315243f86e @@ -151,9 +151,9 @@ 038f9bae9b34d1cca653360a46c5ce1eba4c2ac8 - - https://github.com/nuget/nuget.client - 51ca5ad938c742e6ff876ea1545b0712b130f9d1 + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8 @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 92c39a4f0bacef20812f63e2e1d3f7aa8776038d + 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 - + https://github.com/dotnet/arcade - 92c39a4f0bacef20812f63e2e1d3f7aa8776038d + 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 - + https://github.com/dotnet/arcade - 92c39a4f0bacef20812f63e2e1d3f7aa8776038d + 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 5e816e476..8382e79c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,19 +19,19 @@ - 6.0.0-beta.23167.1 + 6.0.0-beta.23211.7 - 6.0.16-servicing.23174.2 + 6.0.18-servicing.23272.1 - 6.0.16-servicing.23175.3 + 6.0.18-servicing.23272.2 - 6.0.311 + 6.0.313 @@ -44,44 +44,44 @@ - 6.0.16 - 6.0.16 - 6.0.16-servicing.23174.6 - 6.0.16-servicing.23174.6 - 6.0.16-servicing.23174.6 - 6.0.16-servicing.23174.6 + 6.0.18 + 6.0.18 + 6.0.18-servicing.23269.9 + 6.0.18-servicing.23269.9 + 6.0.18-servicing.23269.9 + 6.0.18-servicing.23269.9 0.2.0 - 6.0.311-servicing.23177.16 - 6.0.311-servicing.23177.16 + 6.0.313-servicing.23272.30 + 6.0.313-servicing.23272.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.9 + 6.0.10 - 6.0.16-servicing.23173.11 - 6.0.16-servicing.23173.11 - 6.0.16 - 6.0.16 - 6.0.16 - 6.0.16 + 6.0.18-servicing.23269.7 + 6.0.18-servicing.23269.7 + 6.0.18 + 6.0.18 + 6.0.18 + 6.0.18 2.1.0 - 6.0.16-servicing.23177.4 - 6.0.16-servicing.23177.4 - 6.0.16 - 6.0.16 + 6.0.18-servicing.23272.2 + 6.0.18-servicing.23272.2 + 6.0.18 + 6.0.18 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.311 + 6.0.313 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -152,7 +152,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.2.1-release-20230323-13 + 17.2.1-release-20230405-01 diff --git a/global.json b/global.json index 5bd694fa0..1f0711594 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.115", + "dotnet": "6.0.116", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23167.1", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23167.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23211.7", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23211.7" } }