Skip to content

Upgrade build to use .NET 8 Preview 4 SDK #86408

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

Merged
merged 4 commits into from
May 19, 2023
Merged

Upgrade build to use .NET 8 Preview 4 SDK #86408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
11c7856
Upgrade build to use .NET 8 Preview 4 SDK
jkoritzinsky May 17, 2023
96d2371
Fix parameter orders in RemoteLoopHandler to use the overload that ta…
jkoritzinsky May 17, 2023
25ddebf
Fix TODO in ILCompiler now that we have a newer SDK
jkoritzinsky May 18, 2023
57206f1
Explicitly enable the configuration binding generator in the configur…
jkoritzinsky May 18, 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
8 changes: 5 additions & 3 deletions eng/packaging.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,12 @@
@(DocumentationProjectOutputGroupOutput)" />
<TfmSpecificPackageFile Include="@(TfmRuntimeSpecificPackageFile)"
PackagePath="runtimes\$(_packageTargetRuntime)\$(BuildOutputTargetFolder)\$(_targetFrameworkWithoutSuffix)\" />
<TfmSpecificDebugSymbolsFile Include="$(RuntimeSymbolPath)"
TargetPath="/runtimes/$(_packageTargetRuntime)/$(BuildOutputTargetFolder)/$(_targetFrameworkWithoutSuffix)/%(Filename)%(Extension)"
<!-- Create the item and use its metadata separately to avoid MSB4120. See https://aka.ms/msbuild/metadata-self-ref for more info. -->
<_RuntimeSymbolPath Include="$(RuntimeSymbolPath)" />
<TfmSpecificDebugSymbolsFile Include="@(_RuntimeSymbolPath)"
TargetPath="/runtimes/$(_packageTargetRuntime)/$(BuildOutputTargetFolder)/$(_targetFrameworkWithoutSuffix)/%(_RuntimeSymbolPath.Filename)%(_RuntimeSymbolPath.Extension)"
TargetFramework="$(_targetFrameworkWithoutSuffix)"
Condition="'$(IncludeSymbols)' == 'true' and Exists('$(RuntimeSymbolPath)')" />
Condition="'$(IncludeSymbols)' == 'true' and Exists('%(_RuntimeSymbolPath.Identity)')" />
</ItemGroup>
</Target>

Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"sdk": {
"version": "8.0.100-preview.3.23178.7",
"version": "8.0.100-preview.4.23260.5",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "8.0.100-preview.3.23178.7"
"dotnet": "8.0.100-preview.4.23260.5"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23265.1",
Expand Down
3 changes: 1 addition & 2 deletions src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@
<PropertyGroup>
<CppLinker>$(_CC_LDFLAGS.SubString(0, $(_CC_LDFLAGS.IndexOf(';'))))</CppLinker>
<_LDFLAGS>$(_CC_LDFLAGS.SubString($([MSBuild]::Add($(_CC_LDFLAGS.IndexOf(';')), 1))))</_LDFLAGS>
<!-- TODO: change to <LinkerFlavor>lld</LinkerFlavor> once we pick up an SDK with https://github.com/dotnet/runtime/pull/83558. -->
<UseLLVMLinker Condition="$(_LDFLAGS.Contains('lld'))">true</UseLLVMLinker>
<LinkerFlavor Condition="$(_LDFLAGS.Contains('lld'))">lld</LinkerFlavor>
</PropertyGroup>
</Target>

Expand Down
6 changes: 3 additions & 3 deletions ...ries/Common/tests/System/Net/Prerequisites/RemoteLoopServer/Handlers/RemoteLoopHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public static async Task InvokeAsync(HttpContext context, ILogger logger)
}
catch (Exception ex)
{
logger.LogError("RemoteLoopHandler failed", ex);
logger.LogError(ex, "RemoteLoopHandler failed");
}
}

Expand Down Expand Up @@ -147,14 +147,14 @@ private static async Task ProcessWebSocketRequest(HttpContext context, WebSocket
}
catch (WebSocketException ex)
{
logger.LogWarning("RemoteLoopHandler.ProcessWebSocketRequest closing failed", ex);
logger.LogWarning(ex, "RemoteLoopHandler.ProcessWebSocketRequest closing failed");
}
}
cts.Cancel();
}
catch (Exception ex)
{
logger.LogError("RemoteLoopHandler.ProcessWebSocketRequest failed", ex);
logger.LogError(ex, "RemoteLoopHandler.ProcessWebSocketRequest failed");
}
finally
{
Expand Down
2 changes: 2 additions & 0 deletions ...ceGenerationTests/Microsoft.Extensions.Configuration.Binder.SourceGeneration.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
<DefineConstants>$(DefineConstants);BUILDING_SOURCE_GENERATOR_TESTS;ROSLYN4_0_OR_GREATER;ROSLYN4_4_OR_GREATER</DefineConstants>
<!-- Type not supported; property on type not suppported. -->
<NoWarn>SYSLIB1100,SYSLIB1101</NoWarn>
<!-- The SDK disables the configuration binding generator by default no matter how it was referenced, so we need to enable it here for testing. -->
<EnableConfigurationBindingGenerator>true</EnableConfigurationBindingGenerator>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
Expand Down