wip

RocketSurgeonsGuild · Sep 4, 2024 · bd02ccf · bd02ccf
1 parent eead476
commit bd02ccf
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 51 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -15,7 +15,6 @@
         -->
         <NoWarn>$(NoWarn);NU1701</NoWarn>
         <LangVersion>preview</LangVersion>
-        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
         <Features>strict</Features>
         <Nullable>enable</Nullable>
         <AnalysisMode>AllEnabledByDefault</AnalysisMode>
@@ -41,10 +40,16 @@
             PackagePath="/images/"
             Visible="false"
         />
-        <None Include="$(MSBuildThisFileDirectory)/LICENSE" Pack="true" PackagePath="/" Visible="false" />
+        <None Include="$(MSBuildThisFileDirectory)/LICENSE" Pack="true" PackagePath="/"
+            Visible="false" />
     </ItemGroup>
     <ItemGroup>
         <ProjectCapability Include="DynamicDependentFile" />
         <ProjectCapability Include="DynamicFileNesting" />
     </ItemGroup>
-</Project>
+    <ItemGroup>
+        <Using Include="JetBrains.Annotations" />
+        <Using Include="System.Diagnostics.CodeAnalysis" />
+        <Using Include="System.Diagnostics.CodeAnalysis.NotNullAttribute" Alias="NotNullAttribute" />
+    </ItemGroup>
+</Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project>
+    <PropertyGroup>
+        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    </PropertyGroup>
     <ItemGroup>
         <GlobalPackageReference Include="Rocket.Surgery.MSBuild.CI" Version="1.2.1" />
         <GlobalPackageReference Include="Rocket.Surgery.MSBuild.GitVersion" Version="1.2.1" />
@@ -14,9 +17,12 @@
         <GlobalPackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="4.12.4" />
         <GlobalPackageReference Include="Roslynator.CodeFixes" Version="4.12.4" />
         <GlobalPackageReference Include="Roslynator.Refactorings" Version="4.12.4" />
-        <GlobalPackageReference Include="FakeItEasy.Analyzer.CSharp" Version="6.1.1" Condition="'$(IsTestProject)'=='true'" />
-        <GlobalPackageReference Include="FluentAssertions.Analyzers" Version="0.26.0" Condition="'$(IsTestProject)'=='true'" />
-        <GlobalPackageReference Include="xunit.analyzers" Version="1.15.0" Condition="'$(IsTestProject)'=='true'" />
+        <GlobalPackageReference Include="FakeItEasy.Analyzer.CSharp" Version="6.1.1"
+        />
+        <GlobalPackageReference Include="FluentAssertions.Analyzers" Version="0.26.0"
+        />
+        <GlobalPackageReference Include="xunit.analyzers" Version="1.15.0"
+        />
     </ItemGroup>
     <ItemGroup>
         <PackageVersion Include="LibGit2Sharp" Version="0.30.0" />
@@ -50,4 +56,4 @@
         Project="$(MSBuildThisFileDirectory)/Directory.Packages.support.props"
         Condition="Exists('$(MSBuildThisFileDirectory)/Directory.Packages.support.props')"
     />
-</Project>
+</Project>
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -1,10 +1,11 @@
 <Project>
     <ItemGroup>
-        <!--        <PackageReference-->
-        <!--            Include="Microsoft.CodeAnalysis.PublicApiAnalyzers"-->
-        <!--            IncludeAssets="analyzers;build;buildMultitargeting;buildTransitive"-->
-        <!--            PrivateAssets="All"-->
-        <!--        />-->
+        <PackageReference
+            Include="Microsoft.CodeAnalysis.PublicApiAnalyzers"
+            IncludeAssets="analyzers;build;buildMultitargeting;buildTransitive"
+            PrivateAssets="All"
+        />
     </ItemGroup>
-    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
-</Project>
+    <Import
+        Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
+</Project>
diff --git a/src/Nuke/Rocket.Surgery.Nuke.csproj b/src/Nuke/Rocket.Surgery.Nuke.csproj
@@ -2,47 +2,35 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <NoWarn>$(NoWarn);CS0436</NoWarn>
-      <!-- This has to be turned on because in Nuke.Common.props it is turned off to false, which causes build failures when writing to the same dll multiple times with cross targeting -->
-      <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <InternalsVisibleTo Include="Rocket.Surgery.Nuke.Tests" />
-    <PackageReference Include="LibGit2Sharp" />
-    <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" />
-    <PackageReference Include="Nuke.Common" />
-    <PackageReference Include="Serilog.Extensions.Logging" />
-    <PackageReference Include="System.Collections.Immutable" />
-    <PackageReference Include="System.Interactive.Async" />
-    <PackageReference Include="YamlDotNet" />
-    <PackageReference Include="Buildalyzer" />
-    <PackageReference Include="Humanizer.Core" />
-    <PackageReference Include="LiquidTestReports.Core" />
-    <PackageReference Include="Polyfill" />
+    <InternalsVisibleTo Include="Rocket.Surgery.Nuke.Tests"/>
+    <PackageReference Include="LibGit2Sharp"/>
+    <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing"/>
+    <PackageReference Include="Nuke.Common"/>
+    <PackageReference Include="Serilog.Extensions.Logging"/>
+    <PackageReference Include="System.Collections.Immutable"/>
+    <PackageReference Include="System.Interactive.Async"/>
+    <PackageReference Include="YamlDotNet"/>
+    <PackageReference Include="Buildalyzer"/>
+    <PackageReference Include="Humanizer.Core"/>
+    <PackageReference Include="LiquidTestReports.Core"/>
+    <PackageReference Include="Polyfill"/>
   </ItemGroup>
   <ItemGroup>
-    <None Include="build/*.*" Pack="true" PackagePath="build" />
-    <None Include="buildMultiTargeting/*.*" Pack="true" PackagePath="buildMultiTargeting" />
-    <None Include="buildTransitive/*.*" Pack="true" PackagePath="buildTransitive" />
-    <None Update="buildTransitive\Rocket.Surgery.Nuke.targets">
-      <Pack>true</Pack>
-      <PackagePath>buildMultiTargeting</PackagePath>
-    </None>
-    <None Update="buildTransitive\Rocket.Surgery.Nuke.props">
-      <Pack>true</Pack>
-      <PackagePath>buildMultiTargeting</PackagePath>
-    </None>
+    <None Include="build/*.*" Pack="true" PackagePath="build"/>
+    <None Include="buildMultiTargeting/*.*" Pack="true" PackagePath="buildMultiTargeting"/>
+    <None Include="buildTransitive/*.*" Pack="true" PackagePath="buildTransitive"/>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="default.runsettings" />
-    <Using Include="JetBrains.Annotations" />
-    <Using Include="System.Diagnostics.CodeAnalysis" />
-    <Using Include="Humanizer" />
-    <Using Include="Nuke.Common" />
-    <Using Include="Nuke.Common.Utilities" />
-    <None Remove="Temp\LiquidReporter\Resources\MdMultiReport.md" />
-    <EmbeddedResource Include="Temp\LiquidReporter\Resources\MdMultiReport.md" LogicalName="MdMultiReport.md" />
-
-    <AdditionalFiles Include="build/BannedSymbols.Rocket.Surgery.Nuke.txt" />
-    <GlobalAnalyzerConfigFiles Include="build/banned_symbols.globalconfig" />
+    <EmbeddedResource Include="default.runsettings"/>
+    <Using Include="Humanizer"/>
+    <Using Include="Nuke.Common"/>
+    <Using Include="Nuke.Common.Utilities"/>
+    <None Remove="Temp\LiquidReporter\Resources\MdMultiReport.md"/>
+    <EmbeddedResource Include="Temp\LiquidReporter\Resources\MdMultiReport.md" LogicalName="MdMultiReport.md"/>
+
+    <AdditionalFiles Include="build/BannedSymbols.Rocket.Surgery.Nuke.txt"/>
+    <GlobalAnalyzerConfigFiles Include="build/banned_symbols.globalconfig"/>
   </ItemGroup>
 </Project>