Merge pull request #2 from hikarin522/develop

v0.3.1
hikarin522 · May 19, 2022 · 1f4d000 · 1f4d000
2 parents f1e42a8 + c061ee0
commit 1f4d000
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -3,7 +3,7 @@
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
 
-    <Version>0.3.0</Version>
+    <Version>0.3.1</Version>
     <Authors>hikarin522</Authors>
     <Copyright>(c) 2022 hikarin522.</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/ValueVariant.Generator/ValueVariant.Generator.csproj b/ValueVariant.Generator/ValueVariant.Generator.csproj
@@ -44,7 +44,8 @@
   <Target Name="T4Generate" BeforeTargets="BeforeBuild" Condition="'$(MSBuildRuntimeType)' != 'Full'">
     <Exec Command="dotnet t4 &quot;%(T4.Filename).tt&quot; -c &quot;$(RootNamespace).%(T4.Filename)&quot; -o &quot;%(T4.Filename).cs&quot;" WorkingDirectory="$(MSBuildProjectDirectory)\%(T4.RelativeDir)" />
     <ItemGroup>
-      <Compile Include="@(T4->'%(RelativeDir)%(Filename).cs')" Exclude="@(Compile)">
+      <T4Generated Include="@(T4->'%(RelativeDir)%(Filename).cs')" Exclude="@(Compile)" />
+      <Compile Include="@(T4Generated)">
         <DesignTime>True</DesignTime>
         <AutoGen>True</AutoGen>
         <DependentUpon>%(Filename).tt</DependentUpon>

diff --git a/ValueVariant.Generator/ValueVariantTemplate.tt b/ValueVariant.Generator/ValueVariantTemplate.tt
@@ -75,7 +75,7 @@ namespace <#= Namespace #>
 #if NETSTANDARD2_1_OR_GREATER
         [DoesNotReturn]
 #endif
-        private TV ThrowInvalidCastException<TV>() => throw new InvalidCastException();
+        private static TV ThrowInvalidCastException<TV>() => throw new InvalidCastException();
 
 <# for (var i = 1; i <= Count; ++i ) { #>
         public static implicit operator T(T<#= i #> value) => new T(value);

diff --git a/ValueVariant/ValueVariant.csproj b/ValueVariant/ValueVariant.csproj
@@ -40,7 +40,8 @@
   <Target Name="T4Generate" BeforeTargets="BeforeBuild" Condition="'$(MSBuildRuntimeType)' != 'Full'">
     <Exec Command="dotnet t4 &quot;%(T4.Filename).tt&quot;" WorkingDirectory="$(MSBuildProjectDirectory)\%(T4.RelativeDir)" />
     <ItemGroup>
-      <Compile Include="@(T4->'%(Identity).cs')" Exclude="@(Compile)">
+      <T4Generated Include="@(T4->'%(Identity).cs')" Exclude="@(Compile)" />
+      <Compile Include="@(T4Generated)">
         <DesignTime>True</DesignTime>
         <AutoGen>True</AutoGen>
         <DependentUpon>%(Filename)</DependentUpon>