Skip to content

Commit

Permalink
Use .NET 8 in D2D1 Win2D sample
Browse files Browse the repository at this point in the history
  • Loading branch information
Sergio0694 committed Jul 28, 2023
1 parent 63611a4 commit 73fe1c7
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
3 changes: 3 additions & 0 deletions build/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
For instance, this will warn when using the == operator to compare a struct with a null literal.
-->
<Features>strict</Features>

<!-- WORKAROUND: mismatched analyzer version -->
<NoWarn>$(NoWarn);CS9057</NoWarn>
</PropertyGroup>

<PropertyGroup>
Expand Down
4 changes: 0 additions & 4 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
{
"msbuild-sdks": {
"MSBuild.Sdk.Extras": "3.0.38"
},
"sdk": {
"version": "7.0.202",
"rollForward": "latestFeature"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,18 @@
<PropertyGroup>
<OutputType Condition="'$(CI_RUNNER_SAMPLES_INTEGRATION_TESTS)' == 'true'">Exe</OutputType>
<OutputType Condition="'$(CI_RUNNER_SAMPLES_INTEGRATION_TESTS)' != 'true'">WinExe</OutputType>
<TargetFramework>net7.0-windows10.0.22621</TargetFramework>
<TargetFramework>net8.0-windows10.0.22621</TargetFramework>
<ApplicationManifest>app.manifest</ApplicationManifest>
<Platforms>x64;ARM64</Platforms>
<NoWarn>$(NoWarn);IDE0065</NoWarn>
<AssemblyName>computesharp.d2d1.cli</AssemblyName>
<ApplicationIcon>..\..\assets\icon.ico</ApplicationIcon>

<!-- WORKAROUND: missing feed for runtime assemblies -->
<RestoreSources>
https://api.nuget.org/v3/index.json;
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json;
</RestoreSources>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -19,9 +25,6 @@
<!-- Same optional NativeAOT property group as in ComputeSharp.SwapChain.Cli -->
<PropertyGroup Condition="'$(COMPUTESHARP_SWAPCHAIN_D2D1_PUBLISH_AOT)' == 'true'">
<PublishAot>true</PublishAot>
<UseSystemResourceKeys>true</UseSystemResourceKeys>
<InvariantGlobalization>true</InvariantGlobalization>
<IlcOptimizationPreference>Speed</IlcOptimizationPreference>
</PropertyGroup>

<!-- Also include the .rd.xml file to fix some NativeAOT issues with CsWinRT -->
Expand Down

0 comments on commit 73fe1c7

Please sign in to comment.