Remove design-time fix, share DebugSourceGenerators property

The design-time intellisense issues are gone now, so no need for the fix package. Also, the MSBuild comparison needs to work on pre-16.8 MSBuild (that ValueLessThan is new in .NET5), so switch to a backwards-compatible check.
devlooped · Oct 23, 2020 · a629f18 · a629f18
1 parent af2a78d
commit a629f18
Show file tree

Hide file tree

Showing 15 changed files with 9 additions and 68 deletions.
diff --git a/ThisAssembly.sln b/ThisAssembly.sln
@@ -16,8 +16,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThisAssembly", "src\ThisAss
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThisAssembly.Project", "src\ThisAssembly.Project\ThisAssembly.Project.csproj", "{A91C7A07-FFD6-4D19-BD78-B0BC8F9267DB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThisAssembly.DesignTimeFix", "src\ThisAssembly.DesignTimeFix\ThisAssembly.DesignTimeFix.csproj", "{C64BCC51-5E65-4062-BB92-A7E196DCD580}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThisAssembly.AssemblyInfo", "src\ThisAssembly.AssemblyInfo\ThisAssembly.AssemblyInfo.csproj", "{CDDF83BC-70BE-46C3-BD79-524D868A2812}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThisAssembly.Strings", "src\ThisAssembly.Strings\ThisAssembly.Strings.csproj", "{3E7158B5-BFEF-4416-8226-9096C7C98268}"
@@ -30,7 +28,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThisAssembly.Prerequisites", "src\ThisAssembly.Prerequisites\ThisAssembly.Prerequisites.csproj", "{568E5150-84AD-4619-BEA3-AA5EDF084ABC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThisAssembly.Constants", "src\ThisAssembly.Constants\ThisAssembly.Constants.csproj", "{31C53CCE-13FC-4890-803A-85CD146B909B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThisAssembly.Constants", "src\ThisAssembly.Constants\ThisAssembly.Constants.csproj", "{31C53CCE-13FC-4890-803A-85CD146B909B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -50,10 +48,6 @@ Global
 		{A91C7A07-FFD6-4D19-BD78-B0BC8F9267DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A91C7A07-FFD6-4D19-BD78-B0BC8F9267DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A91C7A07-FFD6-4D19-BD78-B0BC8F9267DB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C64BCC51-5E65-4062-BB92-A7E196DCD580}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C64BCC51-5E65-4062-BB92-A7E196DCD580}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C64BCC51-5E65-4062-BB92-A7E196DCD580}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C64BCC51-5E65-4062-BB92-A7E196DCD580}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CDDF83BC-70BE-46C3-BD79-524D868A2812}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CDDF83BC-70BE-46C3-BD79-524D868A2812}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CDDF83BC-70BE-46C3-BD79-524D868A2812}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/src/ThisAssembly.AssemblyInfo/ThisAssembly.AssemblyInfo.csproj b/src/ThisAssembly.AssemblyInfo/ThisAssembly.AssemblyInfo.csproj
@@ -33,7 +33,6 @@ on the `ThisAssembly.Info` class.
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ThisAssembly.DesignTimeFix\ThisAssembly.DesignTimeFix.csproj" />
     <ProjectReference Include="..\ThisAssembly.Prerequisites\ThisAssembly.Prerequisites.csproj" />
   </ItemGroup>
 

diff --git a/src/ThisAssembly.AssemblyInfo/ThisAssembly.AssemblyInfo.targets b/src/ThisAssembly.AssemblyInfo/ThisAssembly.AssemblyInfo.targets
@@ -1,7 +1,6 @@
 <Project>
 
   <ItemGroup>
-    <CompilerVisibleProperty Include="DebugSourceGenerators" />
     <CompilerVisibleProperty Include="DebugThisAssemblyAssemblyInfo" />
   </ItemGroup>
 

diff --git a/src/ThisAssembly.Constants/ThisAssembly.Constants.csproj b/src/ThisAssembly.Constants/ThisAssembly.Constants.csproj
@@ -53,7 +53,6 @@ C#:
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ThisAssembly.DesignTimeFix\ThisAssembly.DesignTimeFix.csproj" />
     <ProjectReference Include="..\ThisAssembly.Prerequisites\ThisAssembly.Prerequisites.csproj" />
   </ItemGroup>
 

diff --git a/src/ThisAssembly.Constants/ThisAssembly.Constants.targets b/src/ThisAssembly.Constants/ThisAssembly.Constants.targets
@@ -1,7 +1,6 @@
 <Project>
 
   <ItemGroup>
-    <CompilerVisibleProperty Include="DebugSourceGenerators" />
     <CompilerVisibleProperty Include="DebugThisAssemblyConstants" />
 
     <CompilerVisibleItemMetadata Include="AdditionalFiles" MetadataName="SourceItemType" />

diff --git a/src/ThisAssembly.DesignTimeFix/ThisAssembly.DesignTimeFix.csproj b/src/ThisAssembly.DesignTimeFix/ThisAssembly.DesignTimeFix.csproj
diff --git a/src/ThisAssembly.DesignTimeFix/ThisAssembly.DesignTimeFix.targets b/src/ThisAssembly.DesignTimeFix/ThisAssembly.DesignTimeFix.targets
diff --git a/src/ThisAssembly.Metadata/ThisAssembly.Metadata.csproj b/src/ThisAssembly.Metadata/ThisAssembly.Metadata.csproj
@@ -45,7 +45,6 @@ C#:
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ThisAssembly.DesignTimeFix\ThisAssembly.DesignTimeFix.csproj" />
     <ProjectReference Include="..\ThisAssembly.Prerequisites\ThisAssembly.Prerequisites.csproj" />
   </ItemGroup>
 

diff --git a/src/ThisAssembly.Metadata/ThisAssembly.Metadata.targets b/src/ThisAssembly.Metadata/ThisAssembly.Metadata.targets
@@ -1,7 +1,6 @@
 <Project>
 
   <ItemGroup>
-    <CompilerVisibleProperty Include="DebugSourceGenerators" />
     <CompilerVisibleProperty Include="DebugThisAssemblyMetadata" />
   </ItemGroup>
 

diff --git a/src/ThisAssembly.Prerequisites/ThisAssembly.Prerequisites.props b/src/ThisAssembly.Prerequisites/ThisAssembly.Prerequisites.props
@@ -1,7 +1,13 @@
 <Project>
 
   <PropertyGroup>
-    <LangVersion>Preview</LangVersion>
+    <MSBuildShortVersion>$(MSBuildVersion.TrimEnd('0123456789').TrimEnd('.'))</MSBuildShortVersion>
+    <!-- Remove when 16.8/C# 9 is stable -->
+    <LangVersion Condition="'$(MSBuildShortVersion)' == '16.8'">Preview</LangVersion>
   </PropertyGroup>
+
+  <ItemGroup>
+    <CompilerVisibleProperty Include="DebugSourceGenerators" />
+  </ItemGroup>
 
 </Project>
diff --git a/src/ThisAssembly.Prerequisites/ThisAssembly.Prerequisites.targets b/src/ThisAssembly.Prerequisites/ThisAssembly.Prerequisites.targets
@@ -2,7 +2,7 @@
 
   <Target Name="EnsureSourceGenerators" BeforeTargets="BeforeCompile;CoreCompile">
     <Error Text="ThisAssembly requires MSBuild 16.8+ or .NET SDK 5.0+."
-           Condition="$([MSBuild]::VersionLessThan($(MSBuildVersion), '16.8'))" />
+           Condition="$(MSBuildShortVersion) &lt; '16.8'" />
     <Error Text="ThisAssembly uses Roslyn source generators, which are only supported in C# at the moment."
            Condition="'$(Language)' != 'C#'" />
   </Target>

diff --git a/src/ThisAssembly.Project/ThisAssembly.Project.csproj b/src/ThisAssembly.Project/ThisAssembly.Project.csproj
@@ -48,7 +48,6 @@ C#:
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ThisAssembly.DesignTimeFix\ThisAssembly.DesignTimeFix.csproj" />
     <ProjectReference Include="..\ThisAssembly.Prerequisites\ThisAssembly.Prerequisites.csproj" />
   </ItemGroup>
 

diff --git a/src/ThisAssembly.Project/ThisAssembly.Project.targets b/src/ThisAssembly.Project/ThisAssembly.Project.targets
@@ -18,7 +18,6 @@
   </Target>
 
   <ItemGroup>
-    <CompilerVisibleProperty Include="DebugSourceGenerators" />
     <CompilerVisibleProperty Include="DebugThisAssemblyProject" />
   </ItemGroup>
 

diff --git a/src/ThisAssembly.Strings/ThisAssembly.Strings.csproj b/src/ThisAssembly.Strings/ThisAssembly.Strings.csproj
@@ -30,7 +30,6 @@ such as "Hello {name}".
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ThisAssembly.DesignTimeFix\ThisAssembly.DesignTimeFix.csproj" />
     <ProjectReference Include="..\ThisAssembly.Prerequisites\ThisAssembly.Prerequisites.csproj" />
   </ItemGroup>
 

diff --git a/src/ThisAssembly.Strings/ThisAssembly.Strings.targets b/src/ThisAssembly.Strings/ThisAssembly.Strings.targets
@@ -11,7 +11,6 @@
   </Target>
 
   <ItemGroup>
-    <CompilerVisibleProperty Include="DebugSourceGenerators" />
     <CompilerVisibleProperty Include="DebugThisAssemblyStrings" />
 
     <CompilerVisibleItemMetadata Include="AdditionalFiles" MetadataName="SourceItemType" />