Merge pull request #161 from mono/targets-package-cleanup

Clean up build targets package
mono · Oct 2, 2023 · 42747c5 · 42747c5
2 parents 8fd05a6 + 72b685d
commit 42747c5
Show file tree

Hide file tree

Showing 10 changed files with 312 additions and 385 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,17 @@
+{
+  "files.associations": {
+    "*.buildschema.json": "jsonc"
+  },
+  "json.schemas": [
+    {
+      "fileMatch": [
+        "/*.buildschema.json"
+      ],
+      "url": "https://raw.githubusercontent.com/mhutch/MonoDevelop.MSBuildEditor/main/MonoDevelop.MSBuild/Schemas/buildschema.json"
+    }
+  ],
+  "cSpell.words": [
+    "Preprocess",
+    "reimplementation"
+  ]
+}
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -19,6 +19,10 @@
     <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" PrivateAssets="all" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)LICENSE" Pack="true" PackagePath="LICENSE.txt" Visible="False" />
+  </ItemGroup>
+
   <!-- reproducible build -->
   <PropertyGroup>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>

diff --git a/Mono.TextTemplating.Build/Messages.Designer.cs b/Mono.TextTemplating.Build/Messages.Designer.cs
diff --git a/Mono.TextTemplating.Build/Messages.resx b/Mono.TextTemplating.Build/Messages.resx
@@ -127,19 +127,19 @@
     <value>Failed to save T4 build state. All T4 files will be reprocessed on next run.</value>
   </data>
   <data name="DirectiveProcessorDoesNotHaveThreeValues" xml:space="preserve">
-    <value>Directive processor '{0}' could not be split into 'name!class!assembly' components</value>
-  </data>
-  <data name="DirectiveProcessorMissingComponent" xml:space="preserve">
-    <value>Directive processor '{0}' is missing  component '{1}'</value>
+    <value>Directive processor '{0}' has encoded form with incorrect number of components</value>
   </data>
   <data name="DirectiveProcessorNoAssembly" xml:space="preserve">
     <value>Directive processor '{0}' has no 'Assembly' metadata</value>
   </data>
+  <data name="DirectiveProcessorNoClass" xml:space="preserve">
+    <value>Directive processor '{0}' has no 'Class' metadata</value>
+  </data>
   <data name="LoadedStateFile" xml:space="preserve">
     <value>Loaded state file '{0}'</value>
   </data>
-  <data name="ParameterNoValue" xml:space="preserve">
-    <value>Template parameter '{0}' has neither  'Value' metadata nor a value encoded in the name</value>
+  <data name="ArgumentNoValue" xml:space="preserve">
+    <value>Template argument '{0}' has no 'Value' metadata</value>
   </data>
   <data name="RecoverableInternalError" xml:space="preserve">
     <value>T4 engine encountered a recoverable internal error. Although it should not affect output, please report it as it may affect reliability and performance.</value>

diff --git a/Mono.TextTemplating.Build/Mono.TextTemplating.Build.csproj b/Mono.TextTemplating.Build/Mono.TextTemplating.Build.csproj
@@ -38,8 +38,19 @@
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.0.0" PrivateAssets="all" IncludeAssets="compile" />
   </ItemGroup>
 
+  <!-- https://github.com/dotnet/msbuild/issues/4751-->
+  <PropertyGroup>
+    <CoreCompileDependsOn>PrepareResources;$(CompileDependsOn)</CoreCompileDependsOn>
+  </PropertyGroup>
+
   <ItemGroup>
-    <Compile Update="Messages.Designer.cs" DesignTime="True" AutoGen="True" DependentUpon="Messages.resx" />
-    <EmbeddedResource Update="Messages.resx" Generator="ResXFileCodeGenerator" LastGenOutput="Messages.Designer.cs" />
+    <EmbeddedResource
+      Update="@(EmbeddedResource)"
+      StronglyTypedLanguage="CSharp"
+      StronglyTypedClassName="%(Filename)"
+      StronglyTypedNamespace="$(RootNamespace)"
+      Generator="MSBuild:Compile"
+      StronglyTypedFileName="$(IntermediateOutputPath)\%(StronglyTypedNamespace).%(StronglyTypedClassName).Designer.cs"
+      LogicalName="%(StronglyTypedNamespace).%(StronglyTypedClassName).resources" />
   </ItemGroup>
 </Project>
diff --git a/Mono.TextTemplating.Build/Mono.TextTemplating.Build.props b/Mono.TextTemplating.Build/Mono.TextTemplating.Build.props
@@ -5,10 +5,25 @@
   </PropertyGroup>
 
   <ItemDefinitionGroup>
-    <!-- hide T4 key/value pairs from the solution tree -->
+    <!-- hide T4 key/value pairs and other non-file items from the solution tree -->
     <T4ParameterValues>
       <Visible>False</Visible>
     </T4ParameterValues>
+    <T4Argument>
+      <Visible>False</Visible>
+    </T4Argument>
+    <DirectiveProcessor>
+      <Visible>False</Visible>
+    </DirectiveProcessor>
+    <T4ReferencePath>
+      <Visible>False</Visible>
+    </T4ReferencePath>
+    <T4IncludePath>
+      <Visible>False</Visible>
+    </T4IncludePath>
+    <T4AssemblyReference>
+      <Visible>False</Visible>
+    </T4AssemblyReference>
     <!-- transform on save in VS -->
     <T4Transform>
       <Generator>MSBuild:TransformAll</Generator>