Merge pull request #72 from Sergio0694/dev/maintenance

Update NuGet packages and shader .props
Sergio0694 · May 12, 2023 · 4ce276a · 4ce276a
2 parents bebe2df + 4925ec7
commit 4ce276a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -14,6 +14,9 @@
     <!-- Import the global configs from the CodeStyle package (enables all IDExxxx warnings)-->
     <AnalysisLevelStyle>7-all</AnalysisLevelStyle>
 
+    <!-- Enforce all code style rules during build (this replaces referencing Microsoft.CodeAnalysis.CSharp.CodeStyle) -->
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+
     <!--
       Enable the compiler strict mode (see https://www.meziantou.net/csharp-compiler-strict-mode.htm).
       This (poorly documented) mode enables additional warnings for incorrect usages of some features.
@@ -22,11 +25,6 @@
     <Features>strict</Features>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="4.4.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.4.0" PrivateAssets="all" />
-  </ItemGroup>
-
   <!-- Centralized location for all generated artifacts -->
   <PropertyGroup>
     <PackageOutputPath>$(MSBuildThisFileDirectory)artifacts/</PackageOutputPath>

diff --git a/tests/PolySharp.TypeForwards.Tests/PolySharp.TypeForwards.Tests.csproj b/tests/PolySharp.TypeForwards.Tests/PolySharp.TypeForwards.Tests.csproj
@@ -7,13 +7,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <CompilerVisibleProperty Include="PolySharpUsePublicAccessibilityForGeneratedTypes"/>
+    <CompilerVisibleProperty Include="PolySharpUsePublicAccessibilityForGeneratedTypes" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net472' OR '$(TargetFramework)' == 'net48'">