Skip to content

Commit 6ddf6e4

Browse files
jakubmisekjakubmisek
committed
net50
SDK and libraries to target `net50`, allowing to take advantage of new .NET API and get rid of old implementations
1 parent 3cfcc3c commit 6ddf6e4

File tree

34 files changed

+37
-68
lines changed

34 files changed

+37
-68
lines changed

‎Directory.Build.props

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<Version Condition=" '$(APPVEYOR_BUILD_VERSION)'!='' ">$(APPVEYOR_BUILD_VERSION)</Version>
77
<Version Condition=" '$(Version)'=='' ">1.0.0-dev</Version>
88
<PackageVersion>$(Version)</PackageVersion>
9+
<TargetFrameworks>net50</TargetFrameworks>
910

1011
<!-- metadata generation -->
1112
<GenerateAssemblyVersionAttribute>true</GenerateAssemblyVersionAttribute>
@@ -41,6 +42,7 @@
4142
<PeachpieLibraryRegularExpressionsVersion>1.6.0</PeachpieLibraryRegularExpressionsVersion>
4243
<MySqlConnectorVersion>2.0.0</MySqlConnectorVersion>
4344
<ParserVersion>8.1.8808</ParserVersion>
45+
<PeachpieMicrosoftCodeAnalysisVersion>3.7.2</PeachpieMicrosoftCodeAnalysisVersion>
4446

4547
</PropertyGroup>
4648

‎Peachpie.sln

-25
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Peachpie.AspNetCore.Web", "
7676
EndProject
7777
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNetCore", "AspNetCore", "{82A72490-8B53-4A22-BB14-B0C4D6C83D67}"
7878
EndProject
79-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Peachpie.RequestHandler", "src\Peachpie.RequestHandler\Peachpie.RequestHandler.csproj", "{1FC901A6-0242-42A8-9F9A-8C4B1908AA34}"
80-
EndProject
8179
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Peachpie.NET.SdkTests", "src\Tests\Peachpie.NET.SdkTests\Peachpie.NET.SdkTests.csproj", "{937F85EB-7F06-4A34-8C7D-BA3BF88E71AA}"
8280
EndProject
8381
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Peachpie.App.Tests", "src\Tests\Peachpie.App.Tests\Peachpie.App.Tests.csproj", "{C8A0A533-BB62-4CB5-8861-06522DCF5EC2}"
8482
EndProject
85-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNet", "AspNet", "{32648B95-647B-41BC-BC4D-F4A9086E0FF8}"
86-
EndProject
8783
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Benchmarks", "src\Tests\Benchmarks\Benchmarks.csproj", "{E8813100-F717-4DDA-8F5D-E1212B1FAF23}"
8884
EndProject
8985
Global
@@ -598,26 +594,6 @@ Global
598594
{8BE90675-F686-4327-8E13-BE3F7B540CF5}.Release|x64.Build.0 = Release|Any CPU
599595
{8BE90675-F686-4327-8E13-BE3F7B540CF5}.Release|x86.ActiveCfg = Release|Any CPU
600596
{8BE90675-F686-4327-8E13-BE3F7B540CF5}.Release|x86.Build.0 = Release|Any CPU
601-
{1FC901A6-0242-42A8-9F9A-8C4B1908AA34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
602-
{1FC901A6-0242-42A8-9F9A-8C4B1908AA34}.Debug|Any CPU.Build.0 = Debug|Any CPU
603-
{1FC901A6-0242-42A8-9F9A-8C4B1908AA34}.Debug|ARM.ActiveCfg = Debug|Any CPU
604-
{1FC901A6-0242-42A8-9F9A-8C4B1908AA34}.Debug|ARM.Build.0 = Debug|Any CPU
605-
{1FC901A6-0242-42A8-9F9A-8C4B1908AA34}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
606-
{1FC901A6-0242-42A8-9F9A-8C4B1908AA34}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
607-
{1FC901A6-0242-42A8-9F9A-8C4B1908AA34}.Debug|x64.ActiveCfg = Debug|Any CPU
608-
{1FC901A6-0242-42A8-9F9A-8C4B1908AA34}.Debug|x64.Build.0 = Debug|Any CPU
609-
{1FC901A6-0242-42A8-9F9A-8C4B1908AA34}.Debug|x86.ActiveCfg = Debug|Any CPU
610-
{1FC901A6-0242-42A8-9F9A-8C4B1908AA34}.Debug|x86.Build.0 = Debug|Any CPU
611-
{1FC901A6-0242-42A8-9F9A-8C4B1908AA34}.Release|Any CPU.ActiveCfg = Release|Any CPU
612-
{1FC901A6-0242-42A8-9F9A-8C4B1908AA34}.Release|Any CPU.Build.0 = Release|Any CPU
613-
{1FC901A6-0242-42A8-9F9A-8C4B1908AA34}.Release|ARM.ActiveCfg = Release|Any CPU
614-
{1FC901A6-0242-42A8-9F9A-8C4B1908AA34}.Release|ARM.Build.0 = Release|Any CPU
615-
{1FC901A6-0242-42A8-9F9A-8C4B1908AA34}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
616-
{1FC901A6-0242-42A8-9F9A-8C4B1908AA34}.Release|Mixed Platforms.Build.0 = Release|Any CPU
617-
{1FC901A6-0242-42A8-9F9A-8C4B1908AA34}.Release|x64.ActiveCfg = Release|Any CPU
618-
{1FC901A6-0242-42A8-9F9A-8C4B1908AA34}.Release|x64.Build.0 = Release|Any CPU
619-
{1FC901A6-0242-42A8-9F9A-8C4B1908AA34}.Release|x86.ActiveCfg = Release|Any CPU
620-
{1FC901A6-0242-42A8-9F9A-8C4B1908AA34}.Release|x86.Build.0 = Release|Any CPU
621597
{937F85EB-7F06-4A34-8C7D-BA3BF88E71AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
622598
{937F85EB-7F06-4A34-8C7D-BA3BF88E71AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
623599
{937F85EB-7F06-4A34-8C7D-BA3BF88E71AA}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -706,7 +682,6 @@ Global
706682
{07CE395A-7873-40A5-A92D-019CAB583319} = {30D6D91F-A671-4E73-A571-5614500FDE0B}
707683
{9E115135-F58A-4E00-95FE-A2ACF46C4713} = {82A72490-8B53-4A22-BB14-B0C4D6C83D67}
708684
{8BE90675-F686-4327-8E13-BE3F7B540CF5} = {82A72490-8B53-4A22-BB14-B0C4D6C83D67}
709-
{1FC901A6-0242-42A8-9F9A-8C4B1908AA34} = {32648B95-647B-41BC-BC4D-F4A9086E0FF8}
710685
{937F85EB-7F06-4A34-8C7D-BA3BF88E71AA} = {30104149-66C2-44B1-899F-F97E9ECA3860}
711686
{C8A0A533-BB62-4CB5-8861-06522DCF5EC2} = {30104149-66C2-44B1-899F-F97E9ECA3860}
712687
{E8813100-F717-4DDA-8F5D-E1212B1FAF23} = {30104149-66C2-44B1-899F-F97E9ECA3860}

‎src/Compiler/peach/peach.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net461</TargetFramework>
4+
<TargetFramework>net50</TargetFramework>
55
<AssemblyName>peach</AssemblyName>
66
<OutputType>Exe</OutputType>
77
<PackageId>peach</PackageId>
8-
<RuntimeIdentifiers>win;win7;win7-anycpu;ubuntu.14.04;ubuntu.14.04-anycpu;osx.10.10;osx.10.10-anycpu</RuntimeIdentifiers>
8+
<!--RuntimeIdentifiers>win;win7;win7-anycpu;ubuntu.14.04;ubuntu.14.04-anycpu;osx.10.10;osx.10.10-anycpu</RuntimeIdentifiers-->
99
</PropertyGroup>
1010

1111
<ItemGroup>

‎src/PDO/Peachpie.Library.PDO.Firebird/Peachpie.Library.PDO.Firebird.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net50</TargetFrameworks>
55
<PreserveCompilationContext>true</PreserveCompilationContext>
66
<AssemblyName>Peachpie.Library.PDO.Firebird</AssemblyName>
77
<PackageId>Peachpie.Library.PDO.Firebird</PackageId>

‎src/PDO/Peachpie.Library.PDO.IBM/Peachpie.Library.PDO.IBM.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net50</TargetFrameworks>
55
<PreserveCompilationContext>true</PreserveCompilationContext>
66
<AssemblyName>Peachpie.Library.PDO.IBM</AssemblyName>
77
<PackageId>Peachpie.Library.PDO.IBM</PackageId>

‎src/PDO/Peachpie.Library.PDO.MySQL/Peachpie.Library.PDO.MySQL.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net50</TargetFrameworks>
55
<PreserveCompilationContext>true</PreserveCompilationContext>
66
<AssemblyName>Peachpie.Library.PDO.MySQL</AssemblyName>
77
<PackageId>Peachpie.Library.PDO.MySQL</PackageId>

‎src/PDO/Peachpie.Library.PDO.PgSQL/Peachpie.Library.PDO.PgSQL.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net50</TargetFrameworks>
55
<PreserveCompilationContext>true</PreserveCompilationContext>
66
<AssemblyName>Peachpie.Library.PDO.PgSQL</AssemblyName>
77
<PackageId>Peachpie.Library.PDO.PgSQL</PackageId>

‎src/PDO/Peachpie.Library.PDO.SqlSrv/Peachpie.Library.PDO.SqlSrv.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net50</TargetFrameworks>
55
<PreserveCompilationContext>true</PreserveCompilationContext>
66
<AssemblyName>Peachpie.Library.PDO.SqlSrv</AssemblyName>
77
<PackageId>Peachpie.Library.PDO.SqlSrv</PackageId>

‎src/PDO/Peachpie.Library.PDO.Sqlite/Peachpie.Library.PDO.Sqlite.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net50</TargetFrameworks>
55
<PreserveCompilationContext>true</PreserveCompilationContext>
66
<AssemblyName>Peachpie.Library.PDO.Sqlite</AssemblyName>
77
<PackageId>Peachpie.Library.PDO.Sqlite</PackageId>

‎src/PDO/Peachpie.Library.PDO/Peachpie.Library.PDO.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net50</TargetFrameworks>
55
<AssemblyName>Peachpie.Library.PDO</AssemblyName>
66
<PackageId>Peachpie.Library.PDO</PackageId>
77
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>

‎src/Peachpie.App/Peachpie.App.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>Peachpie platform dependencies.</Description>
5-
<TargetFramework>netstandard2.0</TargetFramework>
5+
<TargetFrameworks>net50</TargetFrameworks>
66
<AssemblyName>Peachpie.App</AssemblyName>
77
<PackageId>Peachpie.App</PackageId>
88
<IncludeBuildOutput>false</IncludeBuildOutput>

‎src/Peachpie.AspNetCore.Mvc/Peachpie.AspNetCore.Mvc.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
4+
<TargetFrameworks>net50</TargetFrameworks>
55
<NoWarn>$(NoWarn);1591</NoWarn>
66
<AssemblyName>Peachpie.AspNetCore.Mvc</AssemblyName>
77
<PackageId>Peachpie.AspNetCore.Mvc</PackageId>

‎src/Peachpie.AspNetCore.Web/Peachpie.AspNetCore.Web.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
4+
<TargetFrameworks>net50</TargetFrameworks>
55
<NoWarn>$(NoWarn);1591</NoWarn>
66
<AssemblyName>Peachpie.AspNetCore.Web</AssemblyName>
77
<PackageId>Peachpie.AspNetCore.Web</PackageId>

‎src/Peachpie.AspNetCore.Web/SynchronizedTextWriter.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ sealed class SynchronizedTextWriter : TextWriter
2424
/// <summary>Temporary buffer for encoded single-character.</summary>
2525
byte[] _encodedCharBuffer;
2626

27-
#if NETSTANDARD2_0
27+
#if NETSTANDARD2_0 || NET5_0_OR_GREATER
2828
readonly char[] _charBuffer = new char[1];
2929
#endif
3030

@@ -59,7 +59,7 @@ public void Write(byte[] buffer, int count)
5959
Debug.Assert(buffer != null);
6060
Debug.Assert(count <= buffer.Length);
6161

62-
#if NETSTANDARD2_0
62+
#if NETSTANDARD2_0 || NET5_0_OR_GREATER
6363
HttpResponse.Body.WriteAsync(buffer, 0, count).GetAwaiter().GetResult();
6464
#else
6565
HttpResponse.Body.WriteAsync(new ReadOnlyMemory<byte>(buffer, 0, count)).GetAwaiter().GetResult();
@@ -98,7 +98,7 @@ public override void Write(char value)
9898
{
9999
_encodedCharBuffer ??= new byte[GetEncodingMaxByteSize(Encoding)];
100100

101-
#if NETSTANDARD2_0
101+
#if NETSTANDARD2_0 || NET5_0_OR_GREATER
102102
// encode the char
103103
_charBuffer[0] = value;
104104
var nbytes = Encoding.GetBytes(_charBuffer, 0, 1, _encodedCharBuffer, 0);

‎src/Peachpie.CodeAnalysis/Peachpie.CodeAnalysis.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net50</TargetFrameworks>
55
<NoWarn>$(NoWarn);1591</NoWarn>
66
<AssemblyName>Peachpie.CodeAnalysis</AssemblyName>
77
<PackageId>Peachpie.CodeAnalysis</PackageId>
@@ -13,7 +13,7 @@
1313
<ItemGroup>
1414
<PackageReference Include="Devsense.Php.Parser" Version="$(ParserVersion)" />
1515
<PackageReference Include="Devsense.Php.Phar" Version="1.0.15" />
16-
<PackageReference Include="Peachpie.Microsoft.CodeAnalysis" Version="3.7.1" />
16+
<PackageReference Include="Peachpie.Microsoft.CodeAnalysis" Version="$(PeachpieMicrosoftCodeAnalysisVersion)" />
1717
<PackageReference Include="Peachpie.Library.RegularExpressions" Version="$(PeachpieLibraryRegularExpressionsVersion)" />
1818
<PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
1919
<PackageReference Include="System.Memory" Version="4.5.4" />

‎src/Peachpie.Library.Graphics/Peachpie.Library.Graphics.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
54
<NoWarn>$(NoWarn);1591;1574</NoWarn>
65
<AssemblyName>Peachpie.Library.Graphics</AssemblyName>
76
<PackageId>Peachpie.Library.Graphics</PackageId>

‎src/Peachpie.Library.MsSql/Peachpie.Library.MsSql.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
54
<AssemblyName>Peachpie.Library.MsSql</AssemblyName>
65
<PackageId>Peachpie.Library.MsSql</PackageId>
76
<PackageTags>peachpie;library;mssql</PackageTags>

‎src/Peachpie.Library.MySql/Peachpie.Library.MySql.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
54
<AssemblyName>Peachpie.Library.MySql</AssemblyName>
65
<PackageId>Peachpie.Library.MySql</PackageId>
76
<PackageTags>peachpie;library;mysql</PackageTags>

‎src/Peachpie.Library.Network/Peachpie.Library.Network.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
54
<NoWarn>$(NoWarn);1591;1574</NoWarn>
65
<AssemblyName>Peachpie.Library.Network</AssemblyName>
76
<PackageId>Peachpie.Library.Network</PackageId>

‎src/Peachpie.Library.Scripting/Peachpie.Library.Scripting.csproj

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
54
<NoWarn>$(NoWarn);1591;1574</NoWarn>
65
<AssemblyName>Peachpie.Library.Scripting</AssemblyName>
76
<PackageId>Peachpie.Library.Scripting</PackageId>
@@ -11,13 +10,12 @@
1110
</PropertyGroup>
1211

1312
<ItemGroup>
14-
<PackageReference Include="Peachpie.Microsoft.CodeAnalysis" Version="3.7.1" />
13+
<PackageReference Include="Peachpie.Microsoft.CodeAnalysis" Version="$(PeachpieMicrosoftCodeAnalysisVersion)" />
1514
<!--
1615
System.Runtime.Loader.AssemblyLoadContext cannot be loaded from System.Runtime.Loader 4.0.0 which is hard referenced on full .NET Framework,
1716
you may remove this workaround once it will work using netstandard2.0 well.
1817
-->
19-
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" Condition=" '$(TargetFramework)'=='netstandard2.0' " />
20-
<PackageReference Include="Mono.Posix-4.5" Version="4.5.0" Condition=" '$(TargetFramework)'=='net461' " />
18+
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
2119
</ItemGroup>
2220

2321
<ItemGroup>

‎src/Peachpie.Library.Scripting/PhpCompilationFactory.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
namespace Peachpie.Library.Scripting
1212
{
13-
#if NETSTANDARD
13+
#if NETSTANDARD || NET5_0_OR_GREATER
1414

1515
sealed class PhpCompilationFactory : PhpCompilationFactoryBase
1616
{

‎src/Peachpie.Library.XmlDom/Peachpie.Library.XmlDom.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net50</TargetFrameworks>
55
<NoWarn>$(NoWarn);1591;1574</NoWarn>
66
<AssemblyName>Peachpie.Library.XmlDom</AssemblyName>
77
<PackageId>Peachpie.Library.XmlDom</PackageId>

‎src/Peachpie.Library/Gettext.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ private struct CacheKey : IEquatable<CacheKey>
3737

3838
public bool Equals(CacheKey other) => LocaleDir == other.LocaleDir && Culture.Equals(other.Culture) && Domain == other.Domain;
3939

40-
public override bool Equals(object obj) => obj is CacheKey other && Equals(other);
40+
public override bool Equals(object? obj) => obj is CacheKey other && Equals(other);
4141

4242
public override int GetHashCode()
4343
{

‎src/Peachpie.Library/Miscellaneous.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ public static string php_uname(string mode = "a")
311311

312312
host = System.Net.Dns.GetHostName();
313313

314-
machine = System.Environment.GetEnvironmentVariable("PROCESSOR_ARCHITECTURE");
314+
machine = System.Environment.GetEnvironmentVariable("PROCESSOR_ARCHITECTURE") ?? string.Empty;
315315
if (machine == "x86") machine = "i586"; // TODO
316316

317317
release = "0"; // String.Concat(Environment.OSVersion.Version.Major, ".", Environment.OSVersion.Version.Minor);

‎src/Peachpie.Library/Peachpie.Library.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
54
<NoWarn>$(NoWarn);1591;1574</NoWarn>
65
<AssemblyName>Peachpie.Library</AssemblyName>
76
<PackageId>Peachpie.Library</PackageId>

‎src/Peachpie.NET.Sdk/Peachpie.NET.Sdk.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFramework>net50</TargetFramework>
55
<AssemblyName>Peachpie.NET.Sdk</AssemblyName>
66

77
<PackageOnlyBuild>true</PackageOnlyBuild>
@@ -18,7 +18,7 @@
1818
<NoPackageAnalysis>true</NoPackageAnalysis>
1919
<IncludeBuildOutput>false</IncludeBuildOutput>
2020
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
21-
<PackToolsDir>$(MSBuildThisFileDirectory)bin\$(Configuration)\$(TargetFramework)\publish</PackToolsDir>
21+
<PackToolsDir>$(MSBuildThisFileDirectory)bin\$(Configuration)\net50\publish</PackToolsDir>
2222
<NuspecFile>$(MSBuildThisFileDirectory)$(MSbuildProjectName).nuspec</NuspecFile>
2323
</PropertyGroup>
2424

@@ -88,7 +88,7 @@
8888
</ItemGroup>
8989

9090
<Target Name="PublishAll">
91-
<MSBuild Projects="$(MSBuildProjectFullPath)" Targets="Publish" Properties="GeneratePackageOnBuild=false;Version=$(Version)" />
91+
<MSBuild Projects="$(MSBuildProjectFullPath)" Targets="publish" Properties="GeneratePackageOnBuild=false;Version=$(Version);TargetFramework=net50;" />
9292
</Target>
9393

9494
<Target Name="SetPackageDependencies" BeforeTargets="GenerateNuspec" DependsOnTargets="PublishAll">

‎src/Peachpie.Runtime/Peachpie.Runtime.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
54
<NoWarn>$(NoWarn);1591</NoWarn>
65
<AssemblyName>Peachpie.Runtime</AssemblyName>
76
<PackageId>Peachpie.Runtime</PackageId>

‎src/Tests/Benchmarks/Benchmarks.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>netcoreapp3.1;net50</TargetFrameworks>
5+
<TargetFrameworks>net50</TargetFrameworks>
66
<NoWarn>$(NoWarn);1591;</NoWarn>
77
<LangVersion>8.0</LangVersion>
88
</PropertyGroup>

‎src/Tests/Peachpie.App.Tests/Peachpie.App.Tests.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
3+
<PropertyGroup>
4+
<TargetFrameworks>net50</TargetFrameworks>
55
<NoWarn>$(NoWarn);1591</NoWarn>
66
</PropertyGroup>
77

‎src/Tests/Peachpie.DiagnosticTests/Peachpie.DiagnosticTests.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
3+
<PropertyGroup>
4+
<TargetFrameworks>net50</TargetFrameworks>
55
<NoWarn>$(NoWarn);1591</NoWarn>
66
</PropertyGroup>
77

‎src/Tests/Peachpie.NET.SdkTests/Peachpie.NET.SdkTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFrameworks>net50</TargetFrameworks>
55
<NoWarn>$(NoWarn);1591</NoWarn>
66
</PropertyGroup>
77

‎src/Tests/Peachpie.Runtime.Tests/Peachpie.Runtime.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFrameworks>net50</TargetFrameworks>
55
<NoWarn>$(NoWarn);1591</NoWarn>
66
</PropertyGroup>
77

0 commit comments

Comments
 (0)