Skip to content

Patches from template testing: #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SimonDarksideJ merged 8 commits into from
Sep 25, 2026
Merged

Patches from template testing: #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
daba3a7
Patches from template testing:
SimonDarksideJ Sep 11, 2026
824054f
Reframe comment for the additional copy task, in that it is to assist…
SimonDarksideJ Sep 11, 2026
5a86693
Ensure TrimEnd parsing is also Linux/Mac compliant
SimonDarksideJ Sep 11, 2026
89a903f
Merge branch 'main' of https://github.com/MonoGame/MonoGame.Templates…
SimonDarksideJ Sep 22, 2026
6cfe3b0
Patch content args to use the "$(MSBuildThisFileDirectory)" instead o…
SimonDarksideJ Sep 22, 2026
c6b765d
Addressed Build references from - https://github.com/MonoGame/MonoGam…
SimonDarksideJ Sep 22, 2026
9d57442
Restore the accidentally deleted strings.xml
SimonDarksideJ Sep 23, 2026
d9c0332
Patch from PR#62 updates
SimonDarksideJ Sep 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions ...rp/content/MonoGame.2D.StartKit.CB.CSharp/___SafeGameName___.Content/BuildContent.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,36 @@
<Output TaskParameter="TargetOutputs" ItemName="_ContentBuilderAssembly" />
</MSBuild>
<PropertyGroup>
<ContentOutput>$([System.IO.Path]::TrimEndingDirectorySeparator($([System.IO.Path]::Combine('$(ProjectDir)', '$(OutputPath)'))))</ContentOutput>
<ContentTemp>$([System.IO.Path]::TrimEndingDirectorySeparator($([System.IO.Path]::Combine('$(ProjectDir)', '$(IntermediateOutputPath)'))))</ContentTemp>
<ContentArgs>build -p $(MonoGamePlatform) -s ___SafeGameName___.Content/Assets -o &quot;$(ContentOutput)&quot; -i &quot;$(ContentTemp)&quot;</ContentArgs>
<ContentOutput>$([MSBuild]::NormalizePath('$(ProjectDir)', '$(OutputPath)').TrimEnd('\/'))</ContentOutput>
Comment thread
SimonDarksideJ marked this conversation as resolved.
<ContentTemp>$([MSBuild]::NormalizePath('$(ProjectDir)', '$(IntermediateOutputPath)').TrimEnd('\/'))</ContentTemp>
<ContentArgs>build -p $(MonoGamePlatform) -s "$(MSBuildThisFileDirectory)Assets" -o "$(ContentOutput)" -i "$(ContentTemp)"</ContentArgs>
<ContentCommand>@(_ContentBuilderAssembly->'%(RootDir)%(Directory)%(Filename)')</ContentCommand>
</PropertyGroup>
<Exec Command="&quot;$(ContentCommand)&quot; $(ContentArgs)" WorkingDirectory="$(MSBuildThisFileDirectory)..\" CustomErrorRegularExpression="\[E\] .+" CustomWarningRegularExpression="\[W\] .+" />
</Target>
<Target Name="AddGeneratedContentAssets"
AfterTargets="BuildContent">
<ItemGroup>
<GeneratedAsset Include="$([System.IO.Path]::Combine('$(ProjectDir)', '$(OutputPath)'))Content\**\*" />
<GeneratedAsset Include="$([MSBuild]::NormalizePath('$(ProjectDir)', '$(OutputPath)'))Content\**\*" />

<!-- Post Process Android Assets -->
<AndroidAsset Include="@(GeneratedAsset)"
Condition="'$(MonoGamePlatform)' == 'Android'">
<Link>Content\%(GeneratedAsset.RecursiveDir)%(GeneratedAsset.Filename)%(GeneratedAsset.Extension)</Link>
</AndroidAsset>

<!-- Post Process iOS Bundle Resources -->
<BundleResource Include="@(GeneratedAsset)"
Condition="'$(MonoGamePlatform)' == 'MacOSX' Or '$(MonoGamePlatform)' == 'iOS'">
Comment thread
SimonDarksideJ marked this conversation as resolved.
Condition="'$(MonoGamePlatform)' == 'iOS'">
<Link>Content\%(GeneratedAsset.RecursiveDir)%(GeneratedAsset.Filename)%(GeneratedAsset.Extension)</Link>
</BundleResource>

<!-- Copy content for `dotnet publish` builds -->
<ContentWithTargetPath Include="@(GeneratedAsset)"
Condition="'$(MonoGamePlatform)' != 'Android' And '$(MonoGamePlatform)' != 'iOS'">
<TargetPath>Content\%(GeneratedAsset.RecursiveDir)%(GeneratedAsset.Filename)%(GeneratedAsset.Extension)</TargetPath>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</ContentWithTargetPath>
</ItemGroup>
</Target>
</Project>
2 changes: 2 additions & 0 deletions ...noGame.2D.StartKit.CB.CSharp/___SafeGameName___.Content/___SafeGameName___.Content.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,7 @@
<PackageReference Include="MonoGame.Tool.Dxc" Version="1.8.2505.11" />
<PackageReference Include="MonoGame.Tool.FFmpeg" Version="7.0.0.10" />
<PackageReference Include="MonoGame.Tool.FFprobe" Version="7.0.0.10" />
<PackageReference Include="AssimpNetter" Version="6.0.5.0" ExcludeAssets="native;build" />
<PackageReference Include="MonoGame.Library.Assimp" Version="6.0.5.1" />
</ItemGroup>
</Project>
19 changes: 14 additions & 5 deletions ...tent/MonoGame.Blank.2D.StartKit.CB.CSharp/___SafeGameName___.Content/BuildContent.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,36 @@
<Output TaskParameter="TargetOutputs" ItemName="_ContentBuilderAssembly" />
</MSBuild>
<PropertyGroup>
<ContentOutput>$([System.IO.Path]::TrimEndingDirectorySeparator($([System.IO.Path]::Combine('$(ProjectDir)', '$(OutputPath)'))))</ContentOutput>
<ContentTemp>$([System.IO.Path]::TrimEndingDirectorySeparator($([System.IO.Path]::Combine('$(ProjectDir)', '$(IntermediateOutputPath)'))))</ContentTemp>
<ContentArgs>build -p $(MonoGamePlatform) -s ___SafeGameName___.Content/Assets -o &quot;$(ContentOutput)&quot; -i &quot;$(ContentTemp)&quot;</ContentArgs>
<ContentOutput>$([MSBuild]::NormalizePath('$(ProjectDir)', '$(OutputPath)').TrimEnd('\/'))</ContentOutput>
<ContentTemp>$([MSBuild]::NormalizePath('$(ProjectDir)', '$(IntermediateOutputPath)').TrimEnd('\/'))</ContentTemp>
<ContentArgs>build -p $(MonoGamePlatform) -s "$(MSBuildThisFileDirectory)Assets" -o "$(ContentOutput)" -i "$(ContentTemp)"</ContentArgs>
<ContentCommand>@(_ContentBuilderAssembly->'%(RootDir)%(Directory)%(Filename)')</ContentCommand>
</PropertyGroup>
<Exec Command="&quot;$(ContentCommand)&quot; $(ContentArgs)" WorkingDirectory="$(MSBuildThisFileDirectory)..\" CustomErrorRegularExpression="\[E\] .+" CustomWarningRegularExpression="\[W\] .+" />
</Target>
<Target Name="AddGeneratedContentAssets"
AfterTargets="BuildContent">
<ItemGroup>
<GeneratedAsset Include="$([System.IO.Path]::Combine('$(ProjectDir)', '$(OutputPath)'))Content\**\*" />
<GeneratedAsset Include="$([MSBuild]::NormalizePath('$(ProjectDir)', '$(OutputPath)'))Content\**\*" />

<!-- Post Process Android Assets -->
<AndroidAsset Include="@(GeneratedAsset)"
Condition="'$(MonoGamePlatform)' == 'Android'">
<Link>Content\%(GeneratedAsset.RecursiveDir)%(GeneratedAsset.Filename)%(GeneratedAsset.Extension)</Link>
</AndroidAsset>

<!-- Post Process iOS Bundle Resources -->
<BundleResource Include="@(GeneratedAsset)"
Condition="'$(MonoGamePlatform)' == 'MacOSX' Or '$(MonoGamePlatform)' == 'iOS'">
Condition="'$(MonoGamePlatform)' == 'iOS'">
<Link>Content\%(GeneratedAsset.RecursiveDir)%(GeneratedAsset.Filename)%(GeneratedAsset.Extension)</Link>
</BundleResource>

<!-- Copy content for `dotnet publish` builds -->
<ContentWithTargetPath Include="@(GeneratedAsset)"
Condition="'$(MonoGamePlatform)' != 'Android' And '$(MonoGamePlatform)' != 'iOS'">
<TargetPath>Content\%(GeneratedAsset.RecursiveDir)%(GeneratedAsset.Filename)%(GeneratedAsset.Extension)</TargetPath>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</ContentWithTargetPath>
</ItemGroup>
</Target>
</Project>
2 changes: 2 additions & 0 deletions ....Blank.2D.StartKit.CB.CSharp/___SafeGameName___.Content/___SafeGameName___.Content.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,7 @@
<PackageReference Include="MonoGame.Tool.Dxc" Version="1.8.2505.11" />
<PackageReference Include="MonoGame.Tool.FFmpeg" Version="7.0.0.10" />
<PackageReference Include="MonoGame.Tool.FFprobe" Version="7.0.0.10" />
<PackageReference Include="AssimpNetter" Version="6.0.5.0" ExcludeAssets="native;build" />
<PackageReference Include="MonoGame.Library.Assimp" Version="6.0.5.1" />
</ItemGroup>
</Project>
19 changes: 14 additions & 5 deletions CSharp/content/MonoGame.ContentBuilder.CSharp/BuildContent.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,36 @@
<Output TaskParameter="TargetOutputs" ItemName="_ContentBuilderAssembly" />
</MSBuild>
<PropertyGroup>
<ContentOutput>$([System.IO.Path]::TrimEndingDirectorySeparator($([System.IO.Path]::Combine('$(ProjectDir)', '$(OutputPath)'))))</ContentOutput>
<ContentTemp>$([System.IO.Path]::TrimEndingDirectorySeparator($([System.IO.Path]::Combine('$(ProjectDir)', '$(IntermediateOutputPath)'))))</ContentTemp>
<ContentArgs>build -p $(MonoGamePlatform) -s MGNamespace/Assets -o &quot;$(ContentOutput)&quot; -i &quot;$(ContentTemp)&quot;</ContentArgs>
<ContentOutput>$([MSBuild]::NormalizePath('$(ProjectDir)', '$(OutputPath)').TrimEnd('\/'))</ContentOutput>
<ContentTemp>$([MSBuild]::NormalizePath('$(ProjectDir)', '$(IntermediateOutputPath)').TrimEnd('\/'))</ContentTemp>
<ContentArgs>build -p $(MonoGamePlatform) -s "$(MSBuildThisFileDirectory)Assets" -o "$(ContentOutput)" -i "$(ContentTemp)"</ContentArgs>
<ContentCommand>@(_ContentBuilderAssembly->'%(RootDir)%(Directory)%(Filename)')</ContentCommand>
</PropertyGroup>
<Exec Command="&quot;$(ContentCommand)&quot; $(ContentArgs)" WorkingDirectory="$(MSBuildThisFileDirectory)..\" CustomErrorRegularExpression="\[E\] .+" CustomWarningRegularExpression="\[W\] .+" />
</Target>
<Target Name="AddGeneratedContentAssets"
AfterTargets="BuildContent">
<ItemGroup>
<GeneratedAsset Include="$([System.IO.Path]::Combine('$(ProjectDir)', '$(OutputPath)'))Content\**\*" />
<GeneratedAsset Include="$([MSBuild]::NormalizePath('$(ProjectDir)', '$(OutputPath)'))Content\**\*" />

<!-- Post Process Android Assets -->
<AndroidAsset Include="@(GeneratedAsset)"
Condition="'$(MonoGamePlatform)' == 'Android'">
<Link>Content\%(GeneratedAsset.RecursiveDir)%(GeneratedAsset.Filename)%(GeneratedAsset.Extension)</Link>
</AndroidAsset>

<!-- Post Process iOS Bundle Resources -->
<BundleResource Include="@(GeneratedAsset)"
Condition="'$(MonoGamePlatform)' == 'MacOSX' Or '$(MonoGamePlatform)' == 'iOS'">
Condition="'$(MonoGamePlatform)' == 'iOS'">
<Link>Content\%(GeneratedAsset.RecursiveDir)%(GeneratedAsset.Filename)%(GeneratedAsset.Extension)</Link>
</BundleResource>

<!-- Copy content for `dotnet publish` builds -->
<ContentWithTargetPath Include="@(GeneratedAsset)"
Condition="'$(MonoGamePlatform)' != 'Android' And '$(MonoGamePlatform)' != 'iOS'">
<TargetPath>Content\%(GeneratedAsset.RecursiveDir)%(GeneratedAsset.Filename)%(GeneratedAsset.Extension)</TargetPath>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</ContentWithTargetPath>
</ItemGroup>
</Target>
</Project>
4 changes: 3 additions & 1 deletion CSharp/content/MonoGame.ContentBuilder.CSharp/MGNamespace.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,7 @@
<PackageReference Include="MonoGame.Tool.Dxc" Version="1.8.2505.*" />
<PackageReference Include="MonoGame.Tool.FFmpeg" Version="7.0.0.*" />
<PackageReference Include="MonoGame.Tool.FFprobe" Version="7.0.0.*" />
<PackageReference Include="AssimpNetter" Version="6.0.5.0" ExcludeAssets="native;build" />
<PackageReference Include="MonoGame.Library.Assimp" Version="6.0.5.1" />
</ItemGroup>
</Project>
</Project>