Skip to content

Commit 480b7f1

Browse files
paulushubpaulushub
committed
Improving .NET 5.0 support
- Eliminated all the build warnings
1 parent b74dfc9 commit 480b7f1

File tree

23 files changed

+51
-29
lines changed

23 files changed

+51
-29
lines changed

‎Output/Readme.md

-5
This file was deleted.

‎Samples/GdiSvgTestBox/GdiSvgTestBox.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<DefineConstants Condition="$(TargetFramework.StartsWith('net47'))">$(DefineConstants);DOTNET47;NETFULL</DefineConstants>
3434
<DefineConstants Condition="$(TargetFramework.StartsWith('net48'))">$(DefineConstants);DOTNET48;NETFULL</DefineConstants>
3535
<DefineConstants Condition="$(TargetFramework.StartsWith('netcore'))">$(DefineConstants);NETCORE</DefineConstants>
36-
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NETNEXT</DefineConstants>
36+
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NET50</DefineConstants>
3737
<DefineConstants Condition="$(TargetFramework.StartsWith('netstandard'))">$(DefineConstants);NETSTANDARD</DefineConstants>
3838
</PropertyGroup>
3939
<ItemGroup Condition=" '$(TargetFramework)' == 'net40'">

‎Samples/GdiTestSvgControl/GdiTestSvgControl.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<DefineConstants Condition="$(TargetFramework.StartsWith('net47'))">$(DefineConstants);DOTNET47;NETFULL</DefineConstants>
3434
<DefineConstants Condition="$(TargetFramework.StartsWith('net48'))">$(DefineConstants);DOTNET48;NETFULL</DefineConstants>
3535
<DefineConstants Condition="$(TargetFramework.StartsWith('netcore'))">$(DefineConstants);NETCORE</DefineConstants>
36-
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NETNEXT</DefineConstants>
36+
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NET50</DefineConstants>
3737
<DefineConstants Condition="$(TargetFramework.StartsWith('netstandard'))">$(DefineConstants);NETSTANDARD</DefineConstants>
3838
</PropertyGroup>
3939
<ItemGroup>

‎Samples/GdiW3cSvgTestSuite/GdiW3cSvgTestSuite.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<DefineConstants Condition="$(TargetFramework.StartsWith('net47'))">$(DefineConstants);DOTNET47;NETFULL</DefineConstants>
3535
<DefineConstants Condition="$(TargetFramework.StartsWith('net48'))">$(DefineConstants);DOTNET48;NETFULL</DefineConstants>
3636
<DefineConstants Condition="$(TargetFramework.StartsWith('netcore'))">$(DefineConstants);NETCORE</DefineConstants>
37-
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NETNEXT</DefineConstants>
37+
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NET50</DefineConstants>
3838
<DefineConstants Condition="$(TargetFramework.StartsWith('netstandard'))">$(DefineConstants);NETSTANDARD</DefineConstants>
3939
</PropertyGroup>
4040
<ItemGroup Condition=" '$(TargetFramework)' == 'net40'">

‎Samples/WpfSvgTestBox/WpfSvgTestBox.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<DefineConstants Condition="$(TargetFramework.StartsWith('net47'))">$(DefineConstants);DOTNET47;NETFULL</DefineConstants>
3737
<DefineConstants Condition="$(TargetFramework.StartsWith('net48'))">$(DefineConstants);DOTNET48;NETFULL</DefineConstants>
3838
<DefineConstants Condition="$(TargetFramework.StartsWith('netcore'))">$(DefineConstants);NETCORE</DefineConstants>
39-
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NETNEXT</DefineConstants>
39+
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NET50</DefineConstants>
4040
<DefineConstants Condition="$(TargetFramework.StartsWith('netstandard'))">$(DefineConstants);NETSTANDARD</DefineConstants>
4141
</PropertyGroup>
4242
<ItemGroup>

‎Samples/WpfTestSvgControl/WpfTestSvgControl.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<DefineConstants Condition="$(TargetFramework.StartsWith('net47'))">$(DefineConstants);DOTNET47;NETFULL</DefineConstants>
3131
<DefineConstants Condition="$(TargetFramework.StartsWith('net48'))">$(DefineConstants);DOTNET48;NETFULL</DefineConstants>
3232
<DefineConstants Condition="$(TargetFramework.StartsWith('netcore'))">$(DefineConstants);NETCORE</DefineConstants>
33-
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NETNEXT</DefineConstants>
33+
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NET50</DefineConstants>
3434
<DefineConstants Condition="$(TargetFramework.StartsWith('netstandard'))">$(DefineConstants);NETSTANDARD</DefineConstants>
3535
</PropertyGroup>
3636
<ItemGroup>

‎Samples/WpfTestSvgSample/WpfTestSvgSample.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<DefineConstants Condition="$(TargetFramework.StartsWith('net47'))">$(DefineConstants);DOTNET47;NETFULL</DefineConstants>
3131
<DefineConstants Condition="$(TargetFramework.StartsWith('net48'))">$(DefineConstants);DOTNET48;NETFULL</DefineConstants>
3232
<DefineConstants Condition="$(TargetFramework.StartsWith('netcore'))">$(DefineConstants);NETCORE</DefineConstants>
33-
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NETNEXT</DefineConstants>
33+
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NET50</DefineConstants>
3434
<DefineConstants Condition="$(TargetFramework.StartsWith('netstandard'))">$(DefineConstants);NETSTANDARD</DefineConstants>
3535
</PropertyGroup>
3636
<ItemGroup>

‎Samples/WpfTestThreadSafety/WpfTestThreadSafety.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<DefineConstants Condition="$(TargetFramework.StartsWith('net47'))">$(DefineConstants);DOTNET47;NETFULL</DefineConstants>
2929
<DefineConstants Condition="$(TargetFramework.StartsWith('net48'))">$(DefineConstants);DOTNET48;NETFULL</DefineConstants>
3030
<DefineConstants Condition="$(TargetFramework.StartsWith('netcore'))">$(DefineConstants);NETCORE</DefineConstants>
31-
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NETNEXT</DefineConstants>
31+
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NET50</DefineConstants>
3232
<DefineConstants Condition="$(TargetFramework.StartsWith('netstandard'))">$(DefineConstants);NETSTANDARD</DefineConstants>
3333
</PropertyGroup>
3434
<PropertyGroup>

‎Samples/WpfW3cSvgTestSuite/WpfW3cSvgTestSuite.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<DefineConstants Condition="$(TargetFramework.StartsWith('net47'))">$(DefineConstants);DOTNET47;NETFULL</DefineConstants>
3131
<DefineConstants Condition="$(TargetFramework.StartsWith('net48'))">$(DefineConstants);DOTNET48;NETFULL</DefineConstants>
3232
<DefineConstants Condition="$(TargetFramework.StartsWith('netcore'))">$(DefineConstants);NETCORE</DefineConstants>
33-
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NETNEXT</DefineConstants>
33+
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NET50</DefineConstants>
3434
<DefineConstants Condition="$(TargetFramework.StartsWith('netstandard'))">$(DefineConstants);NETSTANDARD</DefineConstants>
3535
</PropertyGroup>
3636
<ItemGroup>

‎Source/SharpVectorConvertersWpf/SharpVectors.Converters.Wpf.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<DefineConstants Condition="$(TargetFramework.StartsWith('net47'))">$(DefineConstants);DOTNET47;NETFULL</DefineConstants>
3535
<DefineConstants Condition="$(TargetFramework.StartsWith('net48'))">$(DefineConstants);DOTNET48;NETFULL</DefineConstants>
3636
<DefineConstants Condition="$(TargetFramework.StartsWith('netcore'))">$(DefineConstants);NETCORE</DefineConstants>
37-
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NETNEXT</DefineConstants>
37+
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NET50</DefineConstants>
3838
<DefineConstants Condition="$(TargetFramework.StartsWith('netstandard'))">$(DefineConstants);NETSTANDARD</DefineConstants>
3939
</PropertyGroup>
4040
<ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">

‎Source/SharpVectorConvertersWpf/SvgImageBase.cs

+22
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,16 @@ protected Assembly GetEntryAssembly()
389389
// Design time
390390
if (asm == null)
391391
{
392+
#if NET50
393+
asm = (
394+
from assembly in AppDomain.CurrentDomain.GetAssemblies()
395+
where !assembly.IsDynamic
396+
let assmName = Path.GetFileName(assembly.Location).Trim()
397+
where assmName.EndsWith(".exe", comparer)
398+
where !string.Equals(assmName, "XDesProc.exe", comparer) // should not be XDesProc.exe
399+
select assembly
400+
).FirstOrDefault();
401+
#else
392402
asm = (
393403
from assembly in AppDomain.CurrentDomain.GetAssemblies()
394404
where !assembly.IsDynamic
@@ -397,6 +407,7 @@ where assmName.EndsWith(".exe", comparer)
397407
where !string.Equals(assmName, "XDesProc.exe", comparer) // should not be XDesProc.exe
398408
select assembly
399409
).FirstOrDefault();
410+
#endif
400411

401412
if (asm == null)
402413
{
@@ -416,6 +427,16 @@ select assembly
416427
{
417428
if (asm == null)
418429
{
430+
#if NET50
431+
asm = (
432+
from assembly in AppDomain.CurrentDomain.GetAssemblies()
433+
where !assembly.IsDynamic
434+
let assmName = Path.GetFileName(assembly.Location).Trim()
435+
where assmName.EndsWith(".exe", comparer)
436+
where !string.Equals(assmName, "XDesProc.exe", comparer) // should not be XDesProc.exe
437+
select assembly
438+
).FirstOrDefault();
439+
#else
419440
asm = (
420441
from assembly in AppDomain.CurrentDomain.GetAssemblies()
421442
where !assembly.IsDynamic
@@ -424,6 +445,7 @@ where assmName.EndsWith(".exe", comparer)
424445
where !string.Equals(assmName, "XDesProc.exe", comparer) // should not be XDesProc.exe
425446
select assembly
426447
).FirstOrDefault();
448+
#endif
427449
}
428450

429451
Trace.TraceError(ex.ToString());

‎Source/SharpVectorConvertersWpf/Utils/DirectoryUtils.cs

+6
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ public static class DirectoryUtils
1818
{
1919
private sealed class SafeFindHandle : SafeHandleZeroOrMinusOneIsInvalid
2020
{
21+
#if !NET50
2122
[SecurityPermission(SecurityAction.LinkDemand, UnmanagedCode = true)]
23+
#endif
2224
private SafeFindHandle() : base(true)
2325
{
2426
}
@@ -29,7 +31,9 @@ protected override bool ReleaseHandle()
2931
}
3032

3133
[DllImport("kernel32.dll")]
34+
#if !NET50
3235
[ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]
36+
#endif
3337
[SuppressUnmanagedCodeSecurity]
3438
private static extern bool FindClose(IntPtr handle);
3539
}
@@ -133,7 +137,9 @@ public static IEnumerable<string> FindFiles(DirectoryInfo dir,
133137
string pattern, SearchOption searchOption)
134138
{
135139
// We suppressed this demand for each p/invoke call, so demand it upfront once
140+
#if !NET50
136141
new SecurityPermission(SecurityPermissionFlag.UnmanagedCode).Demand();
142+
#endif
137143

138144
// Validate parameters
139145
if (dir == null)

‎Source/SharpVectorCore/SharpVectors.Core.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<DefineConstants Condition="$(TargetFramework.StartsWith('net47'))">$(DefineConstants);DOTNET47;NETFULL</DefineConstants>
3737
<DefineConstants Condition="$(TargetFramework.StartsWith('net48'))">$(DefineConstants);DOTNET48;NETFULL</DefineConstants>
3838
<DefineConstants Condition="$(TargetFramework.StartsWith('netcore'))">$(DefineConstants);NETCORE</DefineConstants>
39-
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NETNEXT</DefineConstants>
39+
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NET50</DefineConstants>
4040
<DefineConstants Condition="$(TargetFramework.StartsWith('netstandard'))">$(DefineConstants);NETSTANDARD</DefineConstants>
4141
</PropertyGroup>
4242
<ItemGroup>

‎Source/SharpVectorCss/SharpVectors.Css.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<DefineConstants Condition="$(TargetFramework.StartsWith('net47'))">$(DefineConstants);DOTNET47;NETFULL</DefineConstants>
3737
<DefineConstants Condition="$(TargetFramework.StartsWith('net48'))">$(DefineConstants);DOTNET48;NETFULL</DefineConstants>
3838
<DefineConstants Condition="$(TargetFramework.StartsWith('netcore'))">$(DefineConstants);NETCORE</DefineConstants>
39-
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NETNEXT</DefineConstants>
39+
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NET50</DefineConstants>
4040
<DefineConstants Condition="$(TargetFramework.StartsWith('netstandard'))">$(DefineConstants);NETSTANDARD</DefineConstants>
4141
</PropertyGroup>
4242
<ItemGroup>

‎Source/SharpVectorDom/SharpVectors.Dom.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<DefineConstants Condition="$(TargetFramework.StartsWith('net47'))">$(DefineConstants);DOTNET47;NETFULL</DefineConstants>
3737
<DefineConstants Condition="$(TargetFramework.StartsWith('net48'))">$(DefineConstants);DOTNET48;NETFULL</DefineConstants>
3838
<DefineConstants Condition="$(TargetFramework.StartsWith('netcore'))">$(DefineConstants);NETCORE</DefineConstants>
39-
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NETNEXT</DefineConstants>
39+
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NET50</DefineConstants>
4040
<DefineConstants Condition="$(TargetFramework.StartsWith('netstandard'))">$(DefineConstants);NETSTANDARD</DefineConstants>
4141
</PropertyGroup>
4242
<ItemGroup>

‎Source/SharpVectorModel/SharpVectors.Model.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<DefineConstants Condition="$(TargetFramework.StartsWith('net47'))">$(DefineConstants);DOTNET47;NETFULL</DefineConstants>
3333
<DefineConstants Condition="$(TargetFramework.StartsWith('net48'))">$(DefineConstants);DOTNET48;NETFULL</DefineConstants>
3434
<DefineConstants Condition="$(TargetFramework.StartsWith('netcore'))">$(DefineConstants);NETCORE</DefineConstants>
35-
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NETNEXT</DefineConstants>
35+
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NET50</DefineConstants>
3636
<DefineConstants Condition="$(TargetFramework.StartsWith('netstandard'))">$(DefineConstants);NETSTANDARD</DefineConstants>
3737
</PropertyGroup>
3838
<ItemGroup>

‎Source/SharpVectorRenderingGdi/Forms/SvgApplicationContext.cs

+2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@ public static DirectoryInfo ExecutableDirectory
1313
DirectoryInfo di;
1414
try
1515
{
16+
#if !NET50
1617
FileIOPermission f = new FileIOPermission(PermissionState.None);
1718
f.AllLocalFiles = FileIOPermissionAccess.Read;
1819

1920
f.Assert();
21+
#endif
2022

2123
di = new FileInfo(System.Windows.Forms.Application.ExecutablePath).Directory;
2224
}

‎Source/SharpVectorRenderingGdi/SharpVectors.Rendering.Gdi.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<DefineConstants Condition="$(TargetFramework.StartsWith('net47'))">$(DefineConstants);DOTNET47;NETFULL</DefineConstants>
3434
<DefineConstants Condition="$(TargetFramework.StartsWith('net48'))">$(DefineConstants);DOTNET48;NETFULL</DefineConstants>
3535
<DefineConstants Condition="$(TargetFramework.StartsWith('netcore'))">$(DefineConstants);NETCORE</DefineConstants>
36-
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NETNEXT</DefineConstants>
36+
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NET50</DefineConstants>
3737
<DefineConstants Condition="$(TargetFramework.StartsWith('netstandard'))">$(DefineConstants);NETSTANDARD</DefineConstants>
3838
</PropertyGroup>
3939
<ItemGroup>

‎Source/SharpVectorRenderingWpf/SharpVectors.Rendering.Wpf.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<DefineConstants Condition="$(TargetFramework.StartsWith('net47'))">$(DefineConstants);DOTNET47;NETFULL</DefineConstants>
3535
<DefineConstants Condition="$(TargetFramework.StartsWith('net48'))">$(DefineConstants);DOTNET48;NETFULL</DefineConstants>
3636
<DefineConstants Condition="$(TargetFramework.StartsWith('netcore'))">$(DefineConstants);NETCORE</DefineConstants>
37-
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NETNEXT</DefineConstants>
37+
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NET50</DefineConstants>
3838
<DefineConstants Condition="$(TargetFramework.StartsWith('netstandard'))">$(DefineConstants);NETSTANDARD</DefineConstants>
3939
</PropertyGroup>
4040
<ItemGroup>

‎Source/SharpVectorRenderingWpf/Utils/WpfApplicationContext.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@ public static DirectoryInfo ExecutableDirectory
1313
DirectoryInfo di;
1414
try
1515
{
16+
#if !NET50
1617
FileIOPermission f = new FileIOPermission(PermissionState.None);
1718
f.AllLocalFiles = FileIOPermissionAccess.Read;
1819

1920
f.Assert();
20-
21+
#endif
2122
di = new DirectoryInfo(Path.GetDirectoryName(
2223
System.Reflection.Assembly.GetExecutingAssembly().Location));
2324
}

‎Source/SharpVectorRenderingWpf/Wpf/WpfDrawingDocument.cs

+2-6
Original file line numberDiff line numberDiff line change
@@ -575,13 +575,9 @@ private bool HitTestDrawing(DrawingGroup group, Point pt, out Drawing hitDrawing
575575
if (group.Bounds.Contains(pt))
576576
{
577577
var transform = group.Transform;
578-
if (transform != null)
578+
if (transform != null && !transform.Value.IsIdentity)
579579
{
580-
var matrix = transform.Value;
581-
if (matrix != null && matrix.IsIdentity == false)
582-
{
583-
pt = transform.Inverse.Transform(pt);
584-
}
580+
pt = transform.Inverse.Transform(pt);
585581
}
586582

587583
DrawingGroup groupDrawing = null;

‎Source/SharpVectorRuntimeWpf/SharpVectors.Runtime.Wpf.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<DefineConstants Condition="$(TargetFramework.StartsWith('net47'))">$(DefineConstants);DOTNET47;NETFULL</DefineConstants>
3535
<DefineConstants Condition="$(TargetFramework.StartsWith('net48'))">$(DefineConstants);DOTNET48;NETFULL</DefineConstants>
3636
<DefineConstants Condition="$(TargetFramework.StartsWith('netcore'))">$(DefineConstants);NETCORE</DefineConstants>
37-
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NETNEXT</DefineConstants>
37+
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NET50</DefineConstants>
3838
<DefineConstants Condition="$(TargetFramework.StartsWith('netstandard'))">$(DefineConstants);NETSTANDARD</DefineConstants>
3939
</PropertyGroup>
4040
<ItemGroup>

‎Source/SharpVectorScripting/SharpVectors.Scripting.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<DefineConstants Condition="$(TargetFramework.StartsWith('net47'))">$(DefineConstants);DOTNET47;NETFULL</DefineConstants>
3434
<DefineConstants Condition="$(TargetFramework.StartsWith('net48'))">$(DefineConstants);DOTNET48;NETFULL</DefineConstants>
3535
<DefineConstants Condition="$(TargetFramework.StartsWith('netcore'))">$(DefineConstants);NETCORE</DefineConstants>
36-
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NETNEXT</DefineConstants>
36+
<DefineConstants Condition="$(TargetFramework.StartsWith('net5'))">$(DefineConstants);NETCORE;NET50</DefineConstants>
3737
<DefineConstants Condition="$(TargetFramework.StartsWith('netstandard'))">$(DefineConstants);NETSTANDARD</DefineConstants>
3838
</PropertyGroup>
3939
<ItemGroup>

0 commit comments

Comments
 (0)