Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main] Update dependencies from dotnet/arcade #70248

Merged
merged 3 commits into from
Oct 5, 2023
Merged

[main] Update dependencies from dotnet/arcade #70248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9cb9e83
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 5, 2023
77b84b2
Suppress a warning
jjonescz Oct 5, 2023
1e4237c
Add missing `in` argument modifiers
jjonescz Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23463.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23504.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
<Sha>f1868a684ed9766d4247d672fd5f96bba4d4bb00</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23426.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23502.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>194f32828726c3f1f63f79f3dc09b9e99c157b11</Sha>
<Sha>0f36b29fb7374379609c3ee6a0b70caf457d8a0e</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DiaSymReader" Version="2.0.0">
Expand All @@ -50,9 +50,9 @@
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5d10d428050c0d6afef30a072c4ae68776621877</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23463.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.23504.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
<Sha>f1868a684ed9766d4247d672fd5f96bba4d4bb00</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23468.1">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/sdk-task.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions eng/common/tools.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand Down
8 changes: 4 additions & 4 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}
2 changes: 1 addition & 1 deletion src/Compilers/Core/CodeAnalysisTest/Collections/ImmutableSegmentedListBuilderTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ public void ItemRef()
var builder = new ImmutableSegmentedList<int>.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));

Expand Down
2 changes: 1 addition & 1 deletion src/Compilers/Core/CodeAnalysisTest/Collections/ImmutableSegmentedListTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down
2 changes: 2 additions & 0 deletions src/Workspaces/Core/Portable/Workspace/Solution/Checksum.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,9 @@ public void WriteTo(ObjectWriter writer)
public void WriteTo(Span<byte> 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)));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not use in?

Copy link
Member

@jjonescz jjonescz Oct 5, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because MemoryMarshal.TryWrite has still ref parameter on older TFMs (before net8.0) and that cannot take in argument.

#pragma warning restore CS9191
}

public static unsafe HashData FromPointer(HashData* hash)
Expand Down