diff --git a/NuGet.config b/NuGet.config index abd0203f3b6c..0815f41ac8a4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,15 +4,12 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c658e58f0b4..4684adc5d4db 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -271,22 +271,22 @@ - + https://github.com/dotnet/arcade - f760da39566d1cfa90c89e38d8dfafb3d43f9cae + f36ea231c234560514ede4c2747897a737ced28f - + https://github.com/dotnet/arcade - f760da39566d1cfa90c89e38d8dfafb3d43f9cae + f36ea231c234560514ede4c2747897a737ced28f - + https://github.com/dotnet/arcade - f760da39566d1cfa90c89e38d8dfafb3d43f9cae + f36ea231c234560514ede4c2747897a737ced28f - + https://github.com/dotnet/arcade - f760da39566d1cfa90c89e38d8dfafb3d43f9cae + f36ea231c234560514ede4c2747897a737ced28f https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 1460f902048c..91e74cafdcd9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 6.0.0 4.0.0 6.0.0 - 7.0.0-beta.22511.2 + 7.0.0-beta.22561.2 7.0.0-preview.22423.2 7.0.0 4.3.0 @@ -187,7 +187,7 @@ 6.7.0 6.1.0 - 7.0.0-beta.22511.2 + 7.0.0-beta.22561.2 4.8.2 6.0.0-beta.22262.1 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index c35087a06019..39be08d4b16c 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.2.1" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.3.1" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index aba6308ad313..449126943299 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -365,8 +365,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.2.1&view=overview - $defaultXCopyMSBuildVersion = '17.2.1' + # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.3.1view=overview + $defaultXCopyMSBuildVersion = '17.3.1' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index 6406b45210fd..f695898c047e 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.100-rc.1.22431.12", + "dotnet": "7.0.100", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22511.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22511.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22561.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22561.2" } }