Skip to content

Commit c4cb55c

Browse files
wtgodbedotnet-maestro[bot]
wtgodbe
and
dotnet-maestro[bot]
authored
Update to net8.0 SDK (dotnet#45879)
* Update to net8.0 SDK * Update global.json * Update Directory.Build.targets.in * Update RedisHubLifetimeManager.cs * Update dependencies from https://github.com/dotnet/arcade build 20230105.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.22630.1 -> To Version 8.0.0-beta.23055.3 * NoWarn * Update WasmLinkerTest.csproj * Update LinkabilityChecker.csproj Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent b7ee505 commit c4cb55c

File tree

13 files changed

+44
-23
lines changed

13 files changed

+44
-23
lines changed

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -302,22 +302,22 @@
302302
<Uri>https://github.com/dotnet/runtime</Uri>
303303
<Sha>5da4a9e919dcee35f831ab69b6e475baaf798875</Sha>
304304
</Dependency>
305-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22630.1">
305+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23055.3">
306306
<Uri>https://github.com/dotnet/arcade</Uri>
307-
<Sha>e82404fca08383513e0b0b3c5308d4a9b18b7c7a</Sha>
307+
<Sha>7502a87ca569989008d3acef120b614604b6805f</Sha>
308308
<SourceBuild RepoName="arcade" ManagedOnly="true" />
309309
</Dependency>
310-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.22630.1">
310+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23055.3">
311311
<Uri>https://github.com/dotnet/arcade</Uri>
312-
<Sha>e82404fca08383513e0b0b3c5308d4a9b18b7c7a</Sha>
312+
<Sha>7502a87ca569989008d3acef120b614604b6805f</Sha>
313313
</Dependency>
314-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.22630.1">
314+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23055.3">
315315
<Uri>https://github.com/dotnet/arcade</Uri>
316-
<Sha>e82404fca08383513e0b0b3c5308d4a9b18b7c7a</Sha>
316+
<Sha>7502a87ca569989008d3acef120b614604b6805f</Sha>
317317
</Dependency>
318-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22630.1">
318+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23055.3">
319319
<Uri>https://github.com/dotnet/arcade</Uri>
320-
<Sha>e82404fca08383513e0b0b3c5308d4a9b18b7c7a</Sha>
320+
<Sha>7502a87ca569989008d3acef120b614604b6805f</Sha>
321321
</Dependency>
322322
</ToolsetDependencies>
323323
</Dependencies>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@
135135
<MicrosoftEntityFrameworkCoreVersion>8.0.0-alpha.1.23059.4</MicrosoftEntityFrameworkCoreVersion>
136136
<MicrosoftEntityFrameworkCoreDesignVersion>8.0.0-alpha.1.23059.4</MicrosoftEntityFrameworkCoreDesignVersion>
137137
<!-- Packages from dotnet/arcade -->
138-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.22630.1</MicrosoftDotNetBuildTasksInstallersVersion>
139-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.22630.1</MicrosoftDotNetBuildTasksTemplatingVersion>
138+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23055.3</MicrosoftDotNetBuildTasksInstallersVersion>
139+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23055.3</MicrosoftDotNetBuildTasksTemplatingVersion>
140140
<!-- Packages from dotnet/source-build-externals -->
141141
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.23055.2</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
142142
<!-- Packages from dotnet/xdt -->

‎eng/common/templates/job/source-index-stage1.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
22
runAsPublic: false
3-
sourceIndexPackageVersion: 1.0.1-20220804.1
3+
sourceIndexPackageVersion: 1.0.1-20221220.2
44
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
55
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
66
preSteps: []
@@ -40,10 +40,10 @@ jobs:
4040
- ${{ preStep }}
4141

4242
- task: UseDotNet@2
43-
displayName: Use .NET Core sdk 3.1
43+
displayName: Use .NET Core SDK 6
4444
inputs:
4545
packageType: sdk
46-
version: 3.1.x
46+
version: 6.0.x
4747
installationPath: $(Agent.TempDirectory)/dotnet
4848
workingDirectory: $(Agent.TempDirectory)
4949

‎eng/common/tools.ps1

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ function InitializeBuildTool() {
581581
ExitWithExitCode 1
582582
}
583583
$dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet')
584-
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net7.0' }
584+
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net8.0' }
585585
} elseif ($msbuildEngine -eq "vs") {
586586
try {
587587
$msbuildPath = InitializeVisualStudioMSBuild -install:$restore
@@ -743,6 +743,8 @@ function MSBuild() {
743743
(Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
744744
(Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.ArcadeLogging.dll')),
745745
(Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
746+
(Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.ArcadeLogging.dll')),
747+
(Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.Arcade.Sdk.dll'))
746748
)
747749
$selectedPath = $null
748750
foreach ($path in $possiblePaths) {

‎eng/common/tools.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ function InitializeBuildTool {
312312
# return values
313313
_InitializeBuildTool="$_InitializeDotNetCli/dotnet"
314314
_InitializeBuildToolCommand="msbuild"
315-
_InitializeBuildToolFramework="net7.0"
315+
_InitializeBuildToolFramework="net8.0"
316316
}
317317

318318
# Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116
@@ -428,6 +428,8 @@ function MSBuild {
428428
possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.Arcade.Sdk.dll" )
429429
possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.ArcadeLogging.dll" )
430430
possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.Arcade.Sdk.dll" )
431+
possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.ArcadeLogging.dll" )
432+
possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.Arcade.Sdk.dll" )
431433
for path in "${possiblePaths[@]}"; do
432434
if [[ -f $path ]]; then
433435
selectedPath=$path

‎eng/tools/GenerateFiles/Directory.Build.targets.in

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,4 +121,18 @@
121121
<Warning Text="Requested Microsoft.AspNetCore.App v${MicrosoftAspNetCoreAppRuntimeVersion} does not exist."
122122
Condition=" !EXISTS('$(_DotNetRoot)shared\Microsoft.AspNetCore.App\${MicrosoftAspNetCoreAppRuntimeVersion}') " />
123123
</Target>
124+
125+
<!--
126+
Make a netstandard2.1 copy of the .net ILLinkPack to work around a trimming issue.
127+
See https://github.com/dotnet/linker/issues/3175
128+
-->
129+
<Target Name="_FixKnownILLinkPack"
130+
BeforeTargets="ProcessFrameworkReferences">
131+
<ItemGroup>
132+
<KnownILLinkPack Include="@(KnownILLinkPack)"
133+
Condition="'%(TargetFramework)' == '${DefaultNetCoreTargetFramework}'"
134+
TargetFramework="netstandard2.1"
135+
ILLinkPackVersion="%(KnownILLinkPack.ILLinkPackVersion)" />
136+
</ItemGroup>
137+
</Target>
124138
</Project>

‎eng/tools/RepoTasks/RepoTasks.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net7.0</TargetFrameworks>
3+
<TargetFrameworks>$(DefaultNetCoreTargetFramework)</TargetFrameworks>
44
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net472</TargetFrameworks>
55
<DefineConstants Condition="'$(TargetFramework)' == 'net472'">$(DefineConstants);BUILD_MSI_TASKS</DefineConstants>
66
<Optimize>false</Optimize>
@@ -19,7 +19,7 @@
1919
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelVersion)" />
2020
</ItemGroup>
2121

22-
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
22+
<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
2323
<PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" />
2424
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
2525
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" />

‎eng/tools/RepoTasks/RepoTasks.tasks

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' == 'core'">net7.0</_RepoTaskAssemblyFolder>
3+
<_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' == 'core'">$(DefaultNetCoreTargetFramework)</_RepoTaskAssemblyFolder>
44
<_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' != 'core'">net472</_RepoTaskAssemblyFolder>
55
<_RepoTaskAssembly>$(ArtifactsBinDir)RepoTasks\Release\$(_RepoTaskAssemblyFolder)\RepoTasks.dll</_RepoTaskAssembly>
66
</PropertyGroup>

‎global.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "8.0.100-alpha.1.22531.1"
3+
"version": "8.0.100-alpha.1.23055.1"
44
},
55
"tools": {
6-
"dotnet": "8.0.100-alpha.1.22531.1",
6+
"dotnet": "8.0.100-alpha.1.23055.1",
77
"runtimes": {
88
"dotnet/x86": [
99
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
@@ -27,7 +27,7 @@
2727
},
2828
"msbuild-sdks": {
2929
"Yarn.MSBuild": "1.22.10",
30-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22630.1",
31-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22630.1"
30+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23055.3",
31+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23055.3"
3232
}
3333
}

‎src/Components/WebAssembly/testassets/WasmLinkerTest/WasmLinkerTest.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<SelfContained>true</SelfContained>
66
<UseMonoRuntime>true</UseMonoRuntime>
77
<UsingMicrosoftNETSdkBlazorWebAssembly>true</UsingMicrosoftNETSdkBlazorWebAssembly>
8+
<PublishTrimmed>true</PublishTrimmed>
89
</PropertyGroup>
910
<ItemGroup>
1011
<Reference Include="Microsoft.AspNetCore.Metadata" />

‎src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
77
<InProcessTestSite>true</InProcessTestSite>
88
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
9+
<NoWarn>$(NoWarn);CA2200</NoWarn>
910
</PropertyGroup>
1011

1112
<Import Project="../FunctionalTest.props" />

‎src/SignalR/server/StackExchangeRedis/src/RedisHubLifetimeManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ private async Task SubscribeToConnection(HubConnectionContext connection)
593593
}
594594
catch (Exception ex)
595595
{
596-
RedisLog.ErrorForwardingResult(_logger, completionMessage.InvocationId, ex);
596+
RedisLog.ErrorForwardingResult(_logger, completionMessage.InvocationId!, ex);
597597
}
598598
}));
599599

‎src/Tools/LinkabilityChecker/LinkabilityChecker.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
44
<IsPackable>false</IsPackable>
55
<OutputType>Exe</OutputType>
6+
<PublishTrimmed>true</PublishTrimmed>
67
</PropertyGroup>
78

89
<Import Project="$(RepoRoot)eng\TrimmableProjects.props" />

0 commit comments

Comments
 (0)