net6.0

peachpiecompiler · Jun 13, 2024 · a4b3e05 · a4b3e05
1 parent ee87b14
commit a4b3e05
Show file tree

Hide file tree

Showing 25 changed files with 5 additions and 35 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -5,8 +5,8 @@
     <!-- version -->
     <Version Condition=" '$(APPVEYOR_BUILD_VERSION)'!='' ">$(APPVEYOR_BUILD_VERSION)</Version>
     <Version Condition=" '$(Version)'=='' ">1.2.0-dev</Version>
+    <TargetFramework>net6.0</TargetFramework>
     <PackageVersion>$(Version)</PackageVersion>
-    <TargetFrameworks>net50</TargetFrameworks>
     <AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
 
     <!-- metadata generation -->

diff --git a/src/Compiler/peach/peach.csproj b/src/Compiler/peach/peach.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net50</TargetFramework>
     <AssemblyName>peach</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>peach</PackageId>

diff --git a/src/PDO/Peachpie.Library.PDO.Firebird/Peachpie.Library.PDO.Firebird.csproj b/src/PDO/Peachpie.Library.PDO.Firebird/Peachpie.Library.PDO.Firebird.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net50</TargetFrameworks>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>Peachpie.Library.PDO.Firebird</AssemblyName>
     <PackageId>Peachpie.Library.PDO.Firebird</PackageId>

diff --git a/src/PDO/Peachpie.Library.PDO.IBM/Peachpie.Library.PDO.IBM.csproj b/src/PDO/Peachpie.Library.PDO.IBM/Peachpie.Library.PDO.IBM.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net50</TargetFrameworks>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>Peachpie.Library.PDO.IBM</AssemblyName>
     <PackageId>Peachpie.Library.PDO.IBM</PackageId>

diff --git a/src/PDO/Peachpie.Library.PDO.MySQL/Peachpie.Library.PDO.MySQL.csproj b/src/PDO/Peachpie.Library.PDO.MySQL/Peachpie.Library.PDO.MySQL.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net50</TargetFrameworks>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>Peachpie.Library.PDO.MySQL</AssemblyName>
     <PackageId>Peachpie.Library.PDO.MySQL</PackageId>

diff --git a/src/PDO/Peachpie.Library.PDO.PgSQL/Peachpie.Library.PDO.PgSQL.csproj b/src/PDO/Peachpie.Library.PDO.PgSQL/Peachpie.Library.PDO.PgSQL.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net50</TargetFrameworks>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>Peachpie.Library.PDO.PgSQL</AssemblyName>
     <PackageId>Peachpie.Library.PDO.PgSQL</PackageId>

diff --git a/src/PDO/Peachpie.Library.PDO.SqlSrv/Peachpie.Library.PDO.SqlSrv.csproj b/src/PDO/Peachpie.Library.PDO.SqlSrv/Peachpie.Library.PDO.SqlSrv.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net50</TargetFrameworks>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>Peachpie.Library.PDO.SqlSrv</AssemblyName>
     <PackageId>Peachpie.Library.PDO.SqlSrv</PackageId>

diff --git a/src/PDO/Peachpie.Library.PDO.Sqlite/Peachpie.Library.PDO.Sqlite.csproj b/src/PDO/Peachpie.Library.PDO.Sqlite/Peachpie.Library.PDO.Sqlite.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net50</TargetFrameworks>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>Peachpie.Library.PDO.Sqlite</AssemblyName>
     <PackageId>Peachpie.Library.PDO.Sqlite</PackageId>

diff --git a/src/PDO/Peachpie.Library.PDO/Peachpie.Library.PDO.csproj b/src/PDO/Peachpie.Library.PDO/Peachpie.Library.PDO.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net50</TargetFrameworks>
     <AssemblyName>Peachpie.Library.PDO</AssemblyName>
     <PackageId>Peachpie.Library.PDO</PackageId>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>

diff --git a/src/Peachpie.App/Peachpie.App.csproj b/src/Peachpie.App/Peachpie.App.csproj
@@ -2,12 +2,10 @@
 
   <PropertyGroup>
     <Description>Peachpie platform dependencies.</Description>
-    <TargetFrameworks>net50</TargetFrameworks>
     <AssemblyName>Peachpie.App</AssemblyName>
     <PackageId>Peachpie.App</PackageId>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <IncludeSymbols>false</IncludeSymbols>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <NoWarn>$(NoWarn),NU5128</NoWarn>
   </PropertyGroup>

diff --git a/src/Peachpie.AspNetCore.Mvc/Peachpie.AspNetCore.Mvc.csproj b/src/Peachpie.AspNetCore.Mvc/Peachpie.AspNetCore.Mvc.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net50</TargetFrameworks>
     <NoWarn>$(NoWarn);1591</NoWarn>
     <AssemblyName>Peachpie.AspNetCore.Mvc</AssemblyName>
     <PackageId>Peachpie.AspNetCore.Mvc</PackageId>

diff --git a/src/Peachpie.AspNetCore.Web/Peachpie.AspNetCore.Web.csproj b/src/Peachpie.AspNetCore.Web/Peachpie.AspNetCore.Web.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net50</TargetFrameworks>
     <NoWarn>$(NoWarn);1591</NoWarn>
     <AssemblyName>Peachpie.AspNetCore.Web</AssemblyName>
     <PackageId>Peachpie.AspNetCore.Web</PackageId>

diff --git a/src/Peachpie.CodeAnalysis/Emitter/Model/PEModuleBuilder.cs b/src/Peachpie.CodeAnalysis/Emitter/Model/PEModuleBuilder.cs
@@ -19,6 +19,7 @@
 using Pchp.CodeAnalysis.Utilities;
 using Pchp.CodeAnalysis.CodeGen;
 using Pchp.CodeAnalysis.Semantics;
+using ReferenceEqualityComparer = Roslyn.Utilities.ReferenceEqualityComparer;
 
 namespace Pchp.CodeAnalysis.Emit
 {

diff --git a/src/Peachpie.CodeAnalysis/Peachpie.CodeAnalysis.csproj b/src/Peachpie.CodeAnalysis/Peachpie.CodeAnalysis.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <NoWarn>$(NoWarn);1591</NoWarn>
     <AssemblyName>Peachpie.CodeAnalysis</AssemblyName>
     <PackageId>Peachpie.CodeAnalysis</PackageId>

diff --git a/src/Peachpie.CodeAnalysis/Symbols/TypeMap.cs b/src/Peachpie.CodeAnalysis/Symbols/TypeMap.cs
@@ -7,6 +7,7 @@
 using Roslyn.Utilities;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.PooledObjects;
+using ReferenceEqualityComparer = Roslyn.Utilities.ReferenceEqualityComparer;
 
 namespace Pchp.CodeAnalysis.Symbols
 {

diff --git a/src/Peachpie.Library.XmlDom/Peachpie.Library.XmlDom.csproj b/src/Peachpie.Library.XmlDom/Peachpie.Library.XmlDom.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net50</TargetFrameworks>
     <NoWarn>$(NoWarn);1591;1574</NoWarn>
     <AssemblyName>Peachpie.Library.XmlDom</AssemblyName>
     <PackageId>Peachpie.Library.XmlDom</PackageId>

diff --git a/src/Peachpie.NET.Sdk/Directory.Build.props b/src/Peachpie.NET.Sdk/Directory.Build.props
diff --git a/src/Peachpie.NET.Sdk/Peachpie.NET.Sdk.csproj b/src/Peachpie.NET.Sdk/Peachpie.NET.Sdk.csproj
@@ -19,7 +19,7 @@
     <NoPackageAnalysis>true</NoPackageAnalysis>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PackToolsDir>$(MSBuildThisFileDirectory)bin\$(Configuration)\$(_TargetFramework)\publish</PackToolsDir>
+    <PackToolsDir>$(MSBuildThisFileDirectory)bin\$(Configuration)\$(TargetFramework)\publish</PackToolsDir>
     <NuspecFile>$(MSBuildThisFileDirectory)$(MSbuildProjectName).nuspec</NuspecFile>
   </PropertyGroup>
 
@@ -89,7 +89,7 @@
   </ItemGroup>
 
   <Target Name="PublishAll">
-    <MSBuild Projects="$(MSBuildProjectFullPath)" Targets="publish" Properties="GeneratePackageOnBuild=false;Version=$(Version);TargetFramework=$(_TargetFramework);" />
+    <MSBuild Projects="$(MSBuildProjectFullPath)" Targets="publish" Properties="GeneratePackageOnBuild=false;Version=$(Version);TargetFramework=$(TargetFramework);" />
   </Target>
 
   <Target Name="SetPackageDependencies" BeforeTargets="GenerateNuspec" DependsOnTargets="PublishAll">

diff --git a/src/Tests/Benchmarks/Benchmarks.csproj b/src/Tests/Benchmarks/Benchmarks.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net60</TargetFrameworks>
     <NoWarn>$(NoWarn);1591;</NoWarn>
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>

diff --git a/src/Tests/Peachpie.App.Tests/Peachpie.App.Tests.csproj b/src/Tests/Peachpie.App.Tests/Peachpie.App.Tests.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net60</TargetFrameworks>
     <NoWarn>$(NoWarn);1591</NoWarn>
   </PropertyGroup>
 

diff --git a/src/Tests/Peachpie.DiagnosticTests/Peachpie.DiagnosticTests.csproj b/src/Tests/Peachpie.DiagnosticTests/Peachpie.DiagnosticTests.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net60</TargetFrameworks>
     <NoWarn>$(NoWarn);1591</NoWarn>
   </PropertyGroup>
 

diff --git a/src/Tests/Peachpie.NET.SdkTests/Peachpie.NET.SdkTests.csproj b/src/Tests/Peachpie.NET.SdkTests/Peachpie.NET.SdkTests.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>    
-    <TargetFrameworks>net60</TargetFrameworks>
     <NoWarn>$(NoWarn);1591</NoWarn>
   </PropertyGroup>
 

diff --git a/src/Tests/Peachpie.Runtime.Tests/Peachpie.Runtime.Tests.csproj b/src/Tests/Peachpie.Runtime.Tests/Peachpie.Runtime.Tests.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>    
-    <TargetFrameworks>net60</TargetFrameworks>
     <NoWarn>$(NoWarn);1591</NoWarn>
   </PropertyGroup>
 

diff --git a/src/Tests/Peachpie.ScriptTests/Peachpie.ScriptTests.csproj b/src/Tests/Peachpie.ScriptTests/Peachpie.ScriptTests.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>    
-    <TargetFrameworks>net60</TargetFrameworks>
     <NoWarn>$(NoWarn);1591</NoWarn>
   </PropertyGroup>
 

diff --git a/src/Tests/Peachpie.Test/Peachpie.Test.csproj b/src/Tests/Peachpie.Test/Peachpie.Test.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net60</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <NoWarn>$(NoWarn);1591</NoWarn>
   </PropertyGroup>