From 9cb9e83cc135d4bc1f41aad99bba1caf7ea482c6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 5 Oct 2023 12:07:17 +0000 Subject: [PATCH 1/3] Update dependencies from https://github.com/dotnet/arcade build 20231004.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23504.4 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23502.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 12 ++++++------ eng/common/sdk-task.ps1 | 2 +- eng/common/tools.ps1 | 6 +++--- global.json | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2174327d2c735..86cdec86a71fc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -27,14 +27,14 @@ - + https://github.com/dotnet/arcade - 1d451c32dda2314c721adbf8829e1c0cd4e681ff + f1868a684ed9766d4247d672fd5f96bba4d4bb00 - + https://github.com/dotnet/xliff-tasks - 194f32828726c3f1f63f79f3dc09b9e99c157b11 + 0f36b29fb7374379609c3ee6a0b70caf457d8a0e @@ -50,9 +50,9 @@ https://github.com/dotnet/roslyn 5d10d428050c0d6afef30a072c4ae68776621877 - + https://github.com/dotnet/arcade - 1d451c32dda2314c721adbf8829e1c0cd4e681ff + f1868a684ed9766d4247d672fd5f96bba4d4bb00 https://github.com/dotnet/roslyn-analyzers diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 6c4ac6fec1a99..91f8196cc808d 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.6.0-2" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.7.2-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 aa74ab4a81e78..84cfe7cd9cb46 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -379,13 +379,13 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = } # Minimum VS version to require. - $vsMinVersionReqdStr = '17.6' + $vsMinVersionReqdStr = '17.7' $vsMinVersionReqd = [Version]::new($vsMinVersionReqdStr) # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.6.0-2 - $defaultXCopyMSBuildVersion = '17.6.0-2' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.7.2-1 + $defaultXCopyMSBuildVersion = '17.7.2-1' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index f963c89592aca..c9cc1f0b863f9 100644 --- a/global.json +++ b/global.json @@ -1,18 +1,18 @@ { "sdk": { - "version": "8.0.100-preview.7.23376.3", + "version": "8.0.100-rc.1.23455.8", "allowPrerelease": false, "rollForward": "latestPatch" }, "tools": { - "dotnet": "8.0.100-preview.7.23376.3", + "dotnet": "8.0.100-rc.1.23455.8", "vs": { "version": "17.6.0" }, "xcopy-msbuild": "17.6.0-2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23463.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23463.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23504.4", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23504.4" } } From 77b84b2c74e1389f66c8617da78fdba73bc210fe Mon Sep 17 00:00:00 2001 From: Jan Jones Date: Thu, 5 Oct 2023 16:43:10 +0300 Subject: [PATCH 2/3] Suppress a warning Cannot be fixed easily since it depends on the target framework. --- src/Workspaces/Core/Portable/Workspace/Solution/Checksum.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/Checksum.cs b/src/Workspaces/Core/Portable/Workspace/Solution/Checksum.cs index 92dbdb5efe80e..f4b7b60fcd13f 100644 --- a/src/Workspaces/Core/Portable/Workspace/Solution/Checksum.cs +++ b/src/Workspaces/Core/Portable/Workspace/Solution/Checksum.cs @@ -133,7 +133,9 @@ public void WriteTo(ObjectWriter writer) public void WriteTo(Span span) { Contract.ThrowIfFalse(span.Length >= HashSize); +#pragma warning disable CS9191 // The 'ref' modifier for an argument corresponding to 'in' parameter is equivalent to 'in'. Consider using 'in' instead. Contract.ThrowIfFalse(MemoryMarshal.TryWrite(span, ref Unsafe.AsRef(in this))); +#pragma warning restore CS9191 } public static unsafe HashData FromPointer(HashData* hash) From 1e4237c19d3eca8cea284fbc678efe18c3ab7a94 Mon Sep 17 00:00:00 2001 From: Jan Jones Date: Thu, 5 Oct 2023 16:58:09 +0300 Subject: [PATCH 3/3] Add missing `in` argument modifiers --- .../Collections/ImmutableSegmentedListBuilderTest.cs | 2 +- .../CodeAnalysisTest/Collections/ImmutableSegmentedListTest.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Compilers/Core/CodeAnalysisTest/Collections/ImmutableSegmentedListBuilderTest.cs b/src/Compilers/Core/CodeAnalysisTest/Collections/ImmutableSegmentedListBuilderTest.cs index 90c8bfb3be889..f369a082b2b58 100644 --- a/src/Compilers/Core/CodeAnalysisTest/Collections/ImmutableSegmentedListBuilderTest.cs +++ b/src/Compilers/Core/CodeAnalysisTest/Collections/ImmutableSegmentedListBuilderTest.cs @@ -380,7 +380,7 @@ public void ItemRef() var builder = new ImmutableSegmentedList.Builder(list); ref readonly var safeRef = ref builder.ItemRef(1); - ref var unsafeRef = ref Unsafe.AsRef(safeRef); + ref var unsafeRef = ref Unsafe.AsRef(in safeRef); Assert.Equal(2, builder.ItemRef(1)); diff --git a/src/Compilers/Core/CodeAnalysisTest/Collections/ImmutableSegmentedListTest.cs b/src/Compilers/Core/CodeAnalysisTest/Collections/ImmutableSegmentedListTest.cs index 87f16a050f0e5..b153618443d3e 100644 --- a/src/Compilers/Core/CodeAnalysisTest/Collections/ImmutableSegmentedListTest.cs +++ b/src/Compilers/Core/CodeAnalysisTest/Collections/ImmutableSegmentedListTest.cs @@ -815,7 +815,7 @@ public void ItemRef() var list = new[] { 1, 2, 3 }.ToImmutableSegmentedList(); ref readonly var safeRef = ref list.ItemRef(1); - ref var unsafeRef = ref Unsafe.AsRef(safeRef); + ref var unsafeRef = ref Unsafe.AsRef(in safeRef); Assert.Equal(2, list.ItemRef(1));