Skip to content

Commit

Permalink
Peachpie.NET.Sdk built for netstandard
Browse files Browse the repository at this point in the history
so it runs under .NET Framework MSBuild
  • Loading branch information
jakubmisek committed Jun 24, 2024
1 parent 5a38f7f commit f856ffe
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<!-- version -->
<Version Condition=" '$(APPVEYOR_BUILD_VERSION)'!='' ">$(APPVEYOR_BUILD_VERSION)</Version>
<Version Condition=" '$(Version)'=='' ">1.2.0-dev</Version>
<TargetFramework>net6.0</TargetFramework>
<TargetFrameworks>net6.0</TargetFrameworks>
<PackageVersion>$(Version)</PackageVersion>
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>

Expand Down
6 changes: 4 additions & 2 deletions src/Peachpie.NET.Sdk/Peachpie.NET.Sdk.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<_TargetFramework>netstandard2.0</_TargetFramework>
<TargetFrameworks>$(_TargetFramework)</TargetFrameworks>
<AssemblyName>Peachpie.NET.Sdk</AssemblyName>

<Version Condition=" '$(Version)'=='' ">1.0.0-dev</Version>
Expand All @@ -19,7 +21,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>

Expand Down Expand Up @@ -89,7 +91,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">
Expand Down

0 comments on commit f856ffe

Please sign in to comment.