Skip to content

Commit 7e9f9ad

Browse files
authored
Revert global.json changes (#16201)
* Revert "Fix signed builds (#16192)" This reverts commit 4c66279. * Revert "[main] Update dependencies from dotnet/arcade (#16119)" This reverts commit b0f2370. * Revert "Update to .NET8rc2 (#16187)" This reverts commit 0ccebeb.
1 parent c291f1e commit 7e9f9ad

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929
</Dependency>
3030
</ProductDependencies>
3131
<ToolsetDependencies>
32-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23525.4">
32+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23463.1">
3333
<Uri>https://github.com/dotnet/arcade</Uri>
34-
<Sha>a57022b44f3ff23de925530ea1d27da9701aed57</Sha>
34+
<Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
3535
<SourceBuild RepoName="arcade" ManagedOnly="true" />
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
37+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23426.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
3838
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
39-
<Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
39+
<Sha>194f32828726c3f1f63f79f3dc09b9e99c157b11</Sha>
4040
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
4141
</Dependency>
4242
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23515.2">

eng/common/sdk-task.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ try {
6464
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
6565
}
6666
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
67-
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.8.1-2" -MemberType NoteProperty
67+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.6.0-2" -MemberType NoteProperty
6868
}
6969
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
7070
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

eng/common/tools.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -379,13 +379,13 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
379379
}
380380

381381
# Minimum VS version to require.
382-
$vsMinVersionReqdStr = '17.7'
382+
$vsMinVersionReqdStr = '17.6'
383383
$vsMinVersionReqd = [Version]::new($vsMinVersionReqdStr)
384384

385385
# If the version of msbuild is going to be xcopied,
386386
# use this version. Version matches a package here:
387-
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.8.1-2
388-
$defaultXCopyMSBuildVersion = '17.8.1-2'
387+
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.6.0-2
388+
$defaultXCopyMSBuildVersion = '17.6.0-2'
389389

390390
if (!$vsRequirements) {
391391
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {

global.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
{
22
"sdk": {
3-
"version": "8.0.100-rc.2.23502.2",
3+
"version": "8.0.100-rc.1.23463.5",
44
"allowPrerelease": true
55
},
66
"tools": {
7-
"dotnet": "8.0.100-rc.2.23502.2",
7+
"dotnet": "8.0.100-rc.1.23463.5",
88
"vs": {
9-
"version": "17.8",
9+
"version": "17.6",
1010
"components": [
1111
"Microsoft.VisualStudio.Component.FSharp"
1212
]
1313
},
14-
"xcopy-msbuild": "17.8.1-2"
14+
"xcopy-msbuild": "17.7.2"
1515
},
1616
"native-tools": {
1717
"perl": "5.38.0.1"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23525.4",
20+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23463.1",
2121
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2"
2222
}
2323
}

0 commit comments

Comments
 (0)