fixed package for wpf code generation / build process

more info: dotnet/wpf#810
6bee · Aug 26, 2021 · bdd1807 · bdd1807
1 parent f355246
commit bdd1807
Show file tree

Hide file tree

Showing 11 changed files with 58 additions and 8 deletions.
diff --git a/aqua.tool.Validation/aqua.tool.Validation.nuspec b/aqua.tool.Validation/aqua.tool.Validation.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="4.8">
     <id>aqua.tool.Validation</id>
-    <version>1.3.0</version>
+    <version>1.4.0</version>
     <authors>Christof Senn</authors>
     <owners>Christof Senn</owners>
     <copyright>Copyright © Christof Senn 2021</copyright>
@@ -19,14 +19,15 @@ Requires C# 8.0 or later.</description>
     <tags>c# csharp validation</tags>
     <dependencies>
       <group>
-        <dependency id="aqua.tool.polyfill.Nullable" version="1.0.1" include="all" />
+        <dependency id="aqua.tool.polyfill.Nullable" version="1.1.0" include="all" />
       </group>
     </dependencies>
     <contentFiles>
       <files include="**/*.cs.pp" />
     </contentFiles>
   </metadata>
   <files>
-    <file src="**/*.*;../license.txt;../aqua-small.png" exclude="**/.*;*.nuspec" target="" />
+    <file src="**/*.*" exclude="**/.*;*.nuspec" target="" />
+    <file src="../license.txt;../aqua-small.png" target="" />
   </files>
 </package>
diff --git a/aqua.tool.Validation/build/aqua.tool.Validation.targets b/aqua.tool.Validation/build/aqua.tool.Validation.targets
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!--
+    Special treatment for WPF build process.
+    More info: https://github.com/dotnet/wpf/issues/810
+  -->
+  <ItemGroup Condition=" '$(UseWPF)' == 'true' ">
+    <_GeneratedCodeFiles Include="$(MSBuildThisFileDirectory)../contentFiles/cs/netstandard1.0/**/*.cs.pp" />
+  </ItemGroup>
+
+</Project>
diff --git a/aqua.tool.Validation/buildMultiTargeting/aqua.tool.Validation.targets b/aqua.tool.Validation/buildMultiTargeting/aqua.tool.Validation.targets
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildThisFileDirectory)../build/$(MSBuildThisFile)" />
+</Project>
diff --git a/aqua.tool.polyfill.IsExternalInit/aqua.tool.polyfill.IsExternalInit.nuspec b/aqua.tool.polyfill.IsExternalInit/aqua.tool.polyfill.IsExternalInit.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="4.8">
     <id>aqua.tool.polyfill.IsExternalInit</id>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
     <authors>Christof Senn</authors>
     <owners>Christof Senn</owners>
     <copyright>Copyright © Christof Senn 2021</copyright>
@@ -22,6 +22,7 @@ This package generats a polyfill type to resolve "Error CS0518 - Predefined type
     </contentFiles>
   </metadata>
   <files>
-    <file src="**/*.*;../license.txt;../aqua-small.png" exclude="**/.*;*.nuspec" target="" />
+    <file src="**/*.*" exclude="**/.*;*.nuspec" target="" />
+    <file src="../license.txt;../aqua-small.png" target="" />
   </files>
 </package>
diff --git a/aqua.tool.polyfill.IsExternalInit/build/aqua.tool.polyfill.IsExternalInit.targets b/aqua.tool.polyfill.IsExternalInit/build/aqua.tool.polyfill.IsExternalInit.targets
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!--
+    Special treatment for WPF build process.
+    More info: https://github.com/dotnet/wpf/issues/810
+  -->
+  <ItemGroup Condition=" '$(UseWPF)' == 'true' ">
+    <_GeneratedCodeFiles Include="$(MSBuildThisFileDirectory)../contentFiles/cs/netstandard1.0/**/*.cs.pp" />
+  </ItemGroup>
+
+</Project>
diff --git a/...ool.polyfill.IsExternalInit/buildMultiTargeting/aqua.tool.polyfill.IsExternalInit.targets b/...ool.polyfill.IsExternalInit/buildMultiTargeting/aqua.tool.polyfill.IsExternalInit.targets
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildThisFileDirectory)../build/$(MSBuildThisFile)" />
+</Project>
diff --git a/aqua.tool.polyfill.IsExternalInit/contentFiles/cs/net5.0/_._ b/aqua.tool.polyfill.IsExternalInit/contentFiles/cs/net5.0/_._
diff --git a/...ime.CompilerServices/IsExternalInit.cs.pp → ...es/cs/netstandard1.0/IsExternalInit.cs.pp b/...ime.CompilerServices/IsExternalInit.cs.pp → ...es/cs/netstandard1.0/IsExternalInit.cs.pp
diff --git a/aqua.tool.polyfill.Nullable/aqua.tool.polyfill.Nullable.nuspec b/aqua.tool.polyfill.Nullable/aqua.tool.polyfill.Nullable.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="4.8">
     <id>aqua.tool.polyfill.Nullable</id>
-    <version>1.0.1</version>
+    <version>1.1.0</version>
     <authors>Christof Senn</authors>
     <owners>Christof Senn</owners>
     <copyright>Copyright © Christof Senn 2020</copyright>
@@ -31,6 +31,7 @@ Requires C# 8.0 or later.</description>
     </contentFiles>
   </metadata>
   <files>
-    <file src="**/*.*;../license.txt;../aqua-small.png" exclude="**/.*;*.nuspec" target="" />
+    <file src="**/*.*" exclude="**/.*;*.nuspec" target="" />
+    <file src="../license.txt;../aqua-small.png" target="" />
   </files>
 </package>
diff --git a/aqua.tool.polyfill.Nullable/build/aqua.tool.polyfill.Nullable.targets b/aqua.tool.polyfill.Nullable/build/aqua.tool.polyfill.Nullable.targets
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!--
+    Special treatment for WPF build process.
+    More info: https://github.com/dotnet/wpf/issues/810
+  -->
+  <ItemGroup Condition=" '$(UseWPF)' == 'true' ">
+    <_GeneratedCodeFiles Include="$(MSBuildThisFileDirectory)../contentFiles/cs/netstandard1.0/**/*.cs.pp" />
+  </ItemGroup>
+
+</Project>
diff --git a/aqua.tool.polyfill.Nullable/buildMultiTargeting/aqua.tool.polyfill.Nullable.targets b/aqua.tool.polyfill.Nullable/buildMultiTargeting/aqua.tool.polyfill.Nullable.targets
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildThisFileDirectory)../build/$(MSBuildThisFile)" />
+</Project>