Skip to content

Commit 6507c6d

Browse files
authored
Revert "[main] Update dependencies from dotnet/arcade (#70248)"
This reverts commit 8967970.
1 parent 0caa880 commit 6507c6d

File tree

7 files changed

+16
-18
lines changed

7 files changed

+16
-18
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@
2727
</Dependency>
2828
</ProductDependencies>
2929
<ToolsetDependencies>
30-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23504.4">
30+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23463.1">
3131
<Uri>https://github.com/dotnet/arcade</Uri>
32-
<Sha>f1868a684ed9766d4247d672fd5f96bba4d4bb00</Sha>
32+
<Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
3333
<SourceBuild RepoName="arcade" ManagedOnly="true" />
3434
</Dependency>
35-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23502.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
35+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23426.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
3636
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
37-
<Sha>0f36b29fb7374379609c3ee6a0b70caf457d8a0e</Sha>
37+
<Sha>194f32828726c3f1f63f79f3dc09b9e99c157b11</Sha>
3838
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
3939
</Dependency>
4040
<Dependency Name="Microsoft.DiaSymReader" Version="2.0.0">
@@ -50,9 +50,9 @@
5050
<Uri>https://github.com/dotnet/roslyn</Uri>
5151
<Sha>5d10d428050c0d6afef30a072c4ae68776621877</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.23504.4">
53+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23463.1">
5454
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>f1868a684ed9766d4247d672fd5f96bba4d4bb00</Sha>
55+
<Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
5656
</Dependency>
5757
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23468.1">
5858
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>

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.7.2-1" -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.7.2-1
388-
$defaultXCopyMSBuildVersion = '17.7.2-1'
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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
22
"sdk": {
3-
"version": "8.0.100-rc.1.23455.8",
3+
"version": "8.0.100-preview.7.23376.3",
44
"allowPrerelease": false,
55
"rollForward": "latestPatch"
66
},
77
"tools": {
8-
"dotnet": "8.0.100-rc.1.23455.8",
8+
"dotnet": "8.0.100-preview.7.23376.3",
99
"vs": {
1010
"version": "17.7.2"
1111
},
1212
"xcopy-msbuild": "17.7.2-1"
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23504.4",
16-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23504.4"
15+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23463.1",
16+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23463.1"
1717
}
1818
}

src/Compilers/Core/CodeAnalysisTest/Collections/ImmutableSegmentedListBuilderTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ public void ItemRef()
380380
var builder = new ImmutableSegmentedList<int>.Builder(list);
381381

382382
ref readonly var safeRef = ref builder.ItemRef(1);
383-
ref var unsafeRef = ref Unsafe.AsRef(in safeRef);
383+
ref var unsafeRef = ref Unsafe.AsRef(safeRef);
384384

385385
Assert.Equal(2, builder.ItemRef(1));
386386

src/Compilers/Core/CodeAnalysisTest/Collections/ImmutableSegmentedListTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -815,7 +815,7 @@ public void ItemRef()
815815
var list = new[] { 1, 2, 3 }.ToImmutableSegmentedList();
816816

817817
ref readonly var safeRef = ref list.ItemRef(1);
818-
ref var unsafeRef = ref Unsafe.AsRef(in safeRef);
818+
ref var unsafeRef = ref Unsafe.AsRef(safeRef);
819819

820820
Assert.Equal(2, list.ItemRef(1));
821821

src/Workspaces/Core/Portable/Workspace/Solution/Checksum.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,7 @@ public void WriteTo(ObjectWriter writer)
130130
public void WriteTo(Span<byte> span)
131131
{
132132
Contract.ThrowIfFalse(span.Length >= HashSize);
133-
#pragma warning disable CS9191 // The 'ref' modifier for an argument corresponding to 'in' parameter is equivalent to 'in'. Consider using 'in' instead.
134133
Contract.ThrowIfFalse(MemoryMarshal.TryWrite(span, ref Unsafe.AsRef(in this)));
135-
#pragma warning restore CS9191
136134
}
137135

138136
public static unsafe HashData FromPointer(HashData* hash)

0 commit comments

Comments
 (0)