Skip to content

Commit

Permalink
Merge pull request #164 from mono/fix-more-packaging
Browse files Browse the repository at this point in the history
Fix more packaging issues
  • Loading branch information
mhutch authored Oct 3, 2023
2 parents e1a447e + b82954e commit b6468f1
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 18 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(TemplatingTargetsPath)\Mono.TextTemplating.Build.props" />
<Import Project="$(TemplatingTargetsPath)\T4.BuildTools.props" />

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
Expand All @@ -10,5 +10,5 @@
<PackageReference Include="System.CodeDom" Version="5.0.0" />
</ItemGroup>

<Import Project="$(TemplatingTargetsPath)\Mono.TextTemplating.Build.targets" />
<Import Project="$(TemplatingTargetsPath)\T4.BuildTools.targets" />
</Project>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(TemplatingTargetsPath)\Mono.TextTemplating.Build.props" />
<Import Project="$(TemplatingTargetsPath)\T4.BuildTools.props" />

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
Expand All @@ -11,5 +11,5 @@
<T4Argument Include="Year" Value="2019" />
</ItemGroup>

<Import Project="$(TemplatingTargetsPath)\Mono.TextTemplating.Build.targets" />
<Import Project="$(TemplatingTargetsPath)\T4.BuildTools.targets" />
</Project>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(TemplatingTargetsPath)\Mono.TextTemplating.Build.props" />
<Import Project="$(TemplatingTargetsPath)\T4.BuildTools.props" />

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
Expand All @@ -12,5 +12,5 @@
<T4Argument Include="Year" Value="2019" />
</ItemGroup>

<Import Project="$(TemplatingTargetsPath)\Mono.TextTemplating.Build.targets" />
<Import Project="$(TemplatingTargetsPath)\T4.BuildTools.targets" />
</Project>
10 changes: 5 additions & 5 deletions Mono.TextTemplating.Build/Mono.TextTemplating.Build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@

<Target Name="AddTargetsFilesToPack" BeforeTargets="GenerateNuspec">
<ItemGroup>
<_PackageFiles Include="Mono.TextTemplating.Build.props" PackagePath="build" Pack="true" />
<_PackageFiles Include="Mono.TextTemplating.Build.targets" PackagePath="build" Pack="true" />
<_PackageFiles Include="multitargeting.props" PackagePath="buildMultiTargeting\Mono.TextTemplating.Build.props" Pack="true" />
<_PackageFiles Include="multitargeting.targets" PackagePath="buildMultiTargeting\Mono.TextTemplating.Build.targets" Pack="true" />
<_PackageFiles Include="Mono.TextTemplating.Build.targets.buildschema.json" PackagePath="build" Pack="true" />
<_PackageFiles Include="T4.BuildTools.props" PackagePath="build\$(PackageId).props" Pack="true" />
<_PackageFiles Include="T4.BuildTools.targets" PackagePath="build\$(PackageId).targets" Pack="true" />
<_PackageFiles Include="multitargeting.props" PackagePath="buildMultiTargeting\$(PackageId).props" Pack="true" />
<_PackageFiles Include="multitargeting.targets" PackagePath="buildMultiTargeting\$(PackageId).targets" Pack="true" />
<_PackageFiles Include="T4.BuildTools.targets.buildschema.json" PackagePath="build\$(PackageId).targets.buildschema.json" Pack="true" />
</ItemGroup>
</Target>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<TextTransformTaskAssembly Condition="'$(TextTransformTaskAssembly)'=='' And '$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\buildTasks\netcoreapp2.1\Mono.TextTemplating.Build.dll</TextTransformTaskAssembly>
<TextTransformTaskAssembly Condition="'$(TextTransformTaskAssembly)'=='' And '$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\buildTasks\net472\Mono.TextTemplating.Build.dll</TextTransformTaskAssembly>
<TextTransformTaskAssembly Condition="'$(TextTransformTaskAssembly)'=='' And '$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\buildTasks\net6.0\Mono.TextTemplating.Build.dll</TextTransformTaskAssembly>
<TextTransformTaskAssembly Condition="'$(TextTransformTaskAssembly)'=='' And '$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\buildTasks\net48\Mono.TextTemplating.Build.dll</TextTransformTaskAssembly>
</PropertyGroup>

<UsingTask AssemblyFile="$(TextTransformTaskAssembly)" TaskName="TextTransform" />
Expand Down
6 changes: 4 additions & 2 deletions Mono.TextTemplating.Build/multitargeting.props
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<Project>
<Import Project="..\build\Mono.TextTemplating.Build.props" />
<Project>
<!--
<Import Project="..\build\$(MSBuildThisFileName).props" />
-->
</Project>
6 changes: 4 additions & 2 deletions Mono.TextTemplating.Build/multitargeting.targets
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<Project>
<Import Project="..\build\Mono.TextTemplating.Build.targets" />
<Project>
<!--
<Import Project="..\build\$(MSBuildThisFileName).targets" />
-->
</Project>
3 changes: 2 additions & 1 deletion dotnet-t4/dotnet-t4.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>t4</AssemblyName>
<PackageId>dotnet-t4</PackageId>
<PackAsTool>True</PackAsTool>
<ToolCommandName>t4</ToolCommandName>
<RollForward>LatestMajor</RollForward>
<Description>Command-line tool for processing T4 templates, a general-purpose way to generate text or code files using C#</Description>
<ToolCommandName>t4</ToolCommandName>
<RootNamespace>Mono.TextTemplating</RootNamespace>
<PackageReadmeFile>readme.md</PackageReadmeFile>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
Expand Down

0 comments on commit b6468f1

Please sign in to comment.