Update template and readme (#670)

* Update template and readme fixes #669 * revert
rr-wfm · Dec 18, 2024 · e5b2557 · e5b2557
1 parent 7abd55e
commit e5b2557
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -53,8 +53,14 @@ You should now have a project file with the following contents:
     <ItemGroup>
         <!-- These packages adds additional code analysis rules -->
         <!-- We recommend using these, but they can be removed if desired -->
-        <PackageReference Include="ErikEJ.DacFX.SqlServer.Rules" Version="1.1.1" />
-        <PackageReference Include="ErikEJ.DacFX.TSQLSmellSCA" Version="1.1.1" />
+        <PackageReference Include="ErikEJ.DacFX.SqlServer.Rules" Version="1.1.2">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="ErikEJ.DacFX.TSQLSmellSCA" Version="1.1.2">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
     </ItemGroup>
 
     <PropertyGroup>
@@ -587,10 +593,16 @@ We know of the following public rules NuGet packages, that you can add to your p
 > These rule sets were included with the SDK in version 2.7.x and 2.8.x, but must be added explicitly with SDK version 2.9.x and later.
 
 ```xml
-  <ItemGroup>
-    <PackageReference Include="ErikEJ.DacFX.SqlServer.Rules" Version="1.1.1" />
-    <PackageReference Include="ErikEJ.DacFX.TSQLSmellSCA" Version="1.1.1" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="ErikEJ.DacFX.SqlServer.Rules" Version="1.1.2">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="ErikEJ.DacFX.TSQLSmellSCA" Version="1.1.2">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>
 ```
 
 They are based on these older repositories:

diff --git a/src/MSBuild.Sdk.SqlProj.Templates/templates/sqlproj/sqlproj.csproj b/src/MSBuild.Sdk.SqlProj.Templates/templates/sqlproj/sqlproj.csproj
@@ -9,8 +9,14 @@
     <ItemGroup>
         <!-- These packages adds additional code analysis rules -->
         <!-- We recommend using these, but they can be removed if desired -->
-        <PackageReference Include="ErikEJ.DacFX.SqlServer.Rules" Version="1.1.1" />
-        <PackageReference Include="ErikEJ.DacFX.TSQLSmellSCA" Version="1.1.1" />
+        <PackageReference Include="ErikEJ.DacFX.SqlServer.Rules" Version="1.1.2">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="ErikEJ.DacFX.TSQLSmellSCA" Version="1.1.2">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
     </ItemGroup>
 
     <PropertyGroup>

diff --git a/test/TestProjectWithAnalyzers/TestProjectWithAnalyzers.csproj b/test/TestProjectWithAnalyzers/TestProjectWithAnalyzers.csproj
@@ -12,9 +12,12 @@
     <None Remove="Procedures\sp_TestUnsuppressed.sql" />
   </ItemGroup>
 
-  <ItemGroup>
-      <PackageReference Include="ErikEJ.DacFX.SqlServer.Rules" Version="1.1.0" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="ErikEJ.DacFX.SqlServer.Rules" Version="1.1.2">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\..\src\MSBuild.Sdk.SqlProj\Sdk\Sdk.targets" />
 </Project>