Update project files.

phmonte · Apr 8, 2024 · ec6d19c · ec6d19c
1 parent 8cfa8f3
commit ec6d19c
Show file tree

Hide file tree

Showing 9 changed files with 126 additions and 38 deletions.
diff --git a/.globalconfig b/.globalconfig
@@ -2,6 +2,8 @@ is_global = true
 
 dotnet_diagnostic.CA1506.severity = none
 dotnet_diagnostic.CA1724.severity = none
+dotnet_diagnostic.CA1707.severity = none # Remove the underscores from member names.
+
 dotnet_diagnostic.CS1591.severity = none
 
 dotnet_diagnostic.CA1020.severity = warning
@@ -17,7 +19,6 @@ dotnet_diagnostic.CA1701.severity = warning
 dotnet_diagnostic.CA1702.severity = warning
 dotnet_diagnostic.CA1703.severity = warning
 dotnet_diagnostic.CA1704.severity = warning
-dotnet_diagnostic.CA1707.severity = warning
 dotnet_diagnostic.CA1709.severity = warning
 dotnet_diagnostic.CA1710.severity = warning
 dotnet_diagnostic.CA1711.severity = warning
@@ -37,6 +38,8 @@ dotnet_diagnostic.CA2204.severity = warning
 dotnet_diagnostic.RCS1002.severity = none
 dotnet_diagnostic.RCS1004.severity = none
 dotnet_diagnostic.RCS1007.severity = none
+dotnet_diagnostic.RCS1008.severity = none # Use explicit type instead of 'var'
+dotnet_diagnostic.RCS1009.severity = none # Use explicit type instead of 'var'
 dotnet_diagnostic.RCS1010.severity = none
 dotnet_diagnostic.RCS1012.severity = none # Use explicit type instead of 'var' (when the type is obvious)
 dotnet_diagnostic.RCS1013.severity = none
@@ -94,9 +97,6 @@ dotnet_diagnostic.RCS1208.severity = none
 dotnet_diagnostic.RCS1219.severity = none
 dotnet_diagnostic.RCS1223.severity = none
 
-
-
-
 dotnet_diagnostic.SA1101.severity = none
 dotnet_diagnostic.SA1118.severity = none
 dotnet_diagnostic.SA1200.severity = none
@@ -285,9 +285,6 @@ dotnet_diagnostic.RCS1229.severity = suggestion
 dotnet_diagnostic.RCS1230.severity = suggestion
 dotnet_diagnostic.RCS1231.severity = suggestion
 
-
-dotnet_diagnostic.RCS1008.severity = warning
-dotnet_diagnostic.RCS1009.severity = warning
 dotnet_diagnostic.RCS1044.severity = warning
 dotnet_diagnostic.RCS1059.severity = warning
 dotnet_diagnostic.RCS1082.severity = warning
@@ -301,3 +298,5 @@ dotnet_diagnostic.RCS1210.severity = warning
 dotnet_diagnostic.RCS1215.severity = warning
 
 dotnet_diagnostic.SX1309.severity = warning
+
+dotnet_diagnostic.VSSpell001.severity = silent # Spell Check
diff --git a/Buildalyzer.sln b/Buildalyzer.sln
@@ -25,6 +25,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
  .globalconfig = .globalconfig
  Directory.Build.props = Directory.Build.props
  LICENSE.md = LICENSE.md
+ nuget.config = nuget.config
+ RELEASE.md = RELEASE.md
+ stylecop.json = stylecop.json
  EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{4FD47340-8E8E-4338-BB20-E4AF8E29E78D}"

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,41 +1,65 @@
 <Project>
 
  <PropertyGroup>
- <Version Condition="'$(BuildalyzerVersion)' == ''">1.0.0</Version>
- <Version Condition="'$(BuildalyzerVersion)' != ''">$(BuildalyzerVersion)</Version>
- <AssemblyVersion>$(Version.Split('-')[0])</AssemblyVersion>
- <FileVersion>$(Version.Split('-')[0])</FileVersion>
- <Authors>Dave Glick, Pablo Monteiro, and contributors</Authors>
- <Company>Dave Glick, Pablo Monteiro, and contributors</Company>
- <PackageIcon>icon.png</PackageIcon>
- <PackageReadmeFile>README.md</PackageReadmeFile>
- <PackageProjectUrl>https://github.com/phmonte/Buildalyzer</PackageProjectUrl>
  <RepositoryUrl>https://github.com/phmonte/Buildalyzer.git</RepositoryUrl>
  <RepositoryType>git</RepositoryType>
  <PackageLicenseExpression>MIT</PackageLicenseExpression>
  <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
  <PublishRepositoryUrl>true</PublishRepositoryUrl>
  <IncludeSymbols>true</IncludeSymbols>
  <SymbolPackageFormat>snupkg</SymbolPackageFormat>
- <GenerateDocumentationFile>true</GenerateDocumentationFile>
- <GenerateDocumentationFile>true</GenerateDocumentationFile>
  <EmbedUntrackedSources>true</EmbedUntrackedSources>
  </PropertyGroup>
 
+ <PropertyGroup Label="Shared properties">
+ <Version Condition="'$(BuildalyzerVersion)' == ''">1.0.0</Version>
+ <Version Condition="'$(BuildalyzerVersion)' != ''">$(BuildalyzerVersion)</Version>
+ <AssemblyVersion>$(Version.Split('-')[0])</AssemblyVersion>
+ <FileVersion>$(Version.Split('-')[0])</FileVersion>
+ <LangVersion>12</LangVersion>
+ <Nullable>enable</Nullable>
+ <GenerateDocumentationFile>true</GenerateDocumentationFile>
+ <IsPublishable>false</IsPublishable>
+ </PropertyGroup>
+
+ <PropertyGroup Label="Package information">
+ <Description>
+ A little utility to perform design-time builds of .NET projects without
+ having to think too hard about it. Should work with any project type on
+ any .NET runtime.
+ </Description>
+ <PackageTags>
+ Roslyn,
+ MsBuild,
+ Workspaces,
+ C#,
+ F#,
+ VB.NET
+ </PackageTags>
+ <Authors>Dave Glick, Pablo Monteiro, Corniel Nobel, and contributors</Authors>
+ <Company>Dave Glick, Pablo Monteiro, and contributors</Company>
+ <Copyright>Dave Glick, Pablo Monteiro</Copyright>
+ <PackageIcon>icon.png</PackageIcon>
+ <PackageIconUrl>https://github.com/phmonte/Buildalyzer/blob/main/icon.png</PackageIconUrl>
+ <PackageReadmeFile>README.md</PackageReadmeFile>
+ <PackageProjectUrl>https://github.com/phmonte/Buildalyzer</PackageProjectUrl>
+ </PropertyGroup>
+
  <ItemGroup>
  <None Include="$(MSBuildThisFileDirectory)\LICENSE.md" Pack="true" PackagePath=""/>
  <None Include="$(MSBuildThisFileDirectory)\icon.png" Pack="true" PackagePath="\"/>
  <None Include="$(MSBuildThisFileDirectory)\README.md" Pack="true" PackagePath="\"/>
  </ItemGroup>
 
-<ItemGroup>
+ <ItemGroup>
  <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all"/>
  </ItemGroup>
 
  <ItemGroup Label="Analyzers">
+ <PackageReference Include="DotNetProjectFile.Analyzers" Version="*" PrivateAssets="all" Condition="'$(TargetFramework)'=='net8.0'" />
  <PackageReference Include="IDisposableAnalyzers" Version="*" PrivateAssets="all"/>
+ <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="*" PrivateAssets="all" />
  <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="*" PrivateAssets="all"/>
- <PackageReference Include="DotNetProjectFile.Analyzers" Version="*" PrivateAssets="all" />
  <PackageReference Include="Roslynator.Analyzers" Version="*" PrivateAssets="all"/>
  <PackageReference Include="SonarAnalyzer.CSharp" Version="*" PrivateAssets="all" />
  <PackageReference Include="StyleCop.Analyzers" Version="*-*" PrivateAssets="all"/>

diff --git a/nuget.config b/nuget.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <packageSources>
+ <clear />
+ <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
+ </packageSources>
+</configuration>
diff --git a/src/Buildalyzer.Logger/Buildalyzer.Logger.csproj b/src/Buildalyzer.Logger/Buildalyzer.Logger.csproj
@@ -2,17 +2,29 @@
 
  <PropertyGroup>
  <TargetFramework>netstandard2.0</TargetFramework>
- <LangVersion>12</LangVersion>
  <IncludeBuildOutput>true</IncludeBuildOutput>
  <Description>The MSBuild logger for Buildalyzer. Not intended to be used directly.</Description>
  <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);PackLogger</TargetsForTfmSpecificBuildOutput>
+ <PackageId>Buildalyzer.Logger</PackageId>
+ <IsPackable>true</IsPackable>
+ <EnablePackageValidation>true</EnablePackageValidation>
+ <PackageValidationBaselineVersion>6.0.0</PackageValidationBaselineVersion>
+ <OutputType>library</OutputType>
+ <PackageReleaseNotes>
+ToBeReleased
+- Target .NET 8.0. #252
+ </PackageReleaseNotes>
  </PropertyGroup>
 
  <ItemGroup>
  <PackageReference Include="Microsoft.Build.Utilities.Core" Version="14.3.0" PrivateAssets="all" />
  <PackageReference Include="MsBuildPipeLogger.Logger" Version="1.1.6" PrivateAssets="all" IsLogger="true" />
  </ItemGroup>
 
+ <ItemGroup Label="Additional files">
+ <AdditionalFiles Include="*.csproj" Visible="false" />
+ </ItemGroup>
+
  <!-- Get the logger files for later use -->
  <Target Name="GetLoggerFiles" DependsOnTargets="ResolveReferences">
  <ItemGroup>

diff --git a/src/Buildalyzer.Workspaces/Buildalyzer.Workspaces.csproj b/src/Buildalyzer.Workspaces/Buildalyzer.Workspaces.csproj
@@ -2,8 +2,20 @@
 
  <PropertyGroup>
  <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
- <LangVersion>12</LangVersion>
- <Description>A little utility to perform design-time builds of .NET projects without having to think too hard about it. This extension library adds support for creating a Roslyn workspace from Buildalyzer.</Description>
+ <Description>
+ A little utility to perform design-time builds of .NET projects without
+ having to think too hard about it. This extension library adds support
+ for creating a Roslyn workspace from Buildalyzer.
+ </Description>
+ <PackageId>Buildalyzer.Workspaces</PackageId>
+ <IsPackable>true</IsPackable>
+ <EnablePackageValidation>true</EnablePackageValidation>
+ <PackageValidationBaselineVersion>6.0.0</PackageValidationBaselineVersion>
+ <OutputType>library</OutputType>
+ <PackageReleaseNotes>
+ToBeReleased
+- Target .NET 8.0. #252
+ </PackageReleaseNotes>
  </PropertyGroup>
 
  <ItemGroup>
@@ -15,4 +27,8 @@
  <ProjectReference Include="..\Buildalyzer\Buildalyzer.csproj" />
  </ItemGroup>
 
+ <ItemGroup Label="Additional files">
+ <AdditionalFiles Include="*.csproj" Visible="false" />
+ </ItemGroup>
+
 </Project>
diff --git a/src/Buildalyzer/Buildalyzer.csproj b/src/Buildalyzer/Buildalyzer.csproj
@@ -1,19 +1,29 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
  <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
- <LangVersion>12</LangVersion>
- <Description>A little utility to perform design-time builds of .NET projects without having to think too hard about it. Should work with any project type on any .NET runtime.</Description>
+ <PackageId>Buildalyzer</PackageId>
+ <IsPackable>true</IsPackable>
+ <EnablePackageValidation>true</EnablePackageValidation>
+ <PackageValidationBaselineVersion>6.0.0</PackageValidationBaselineVersion>
+ <OutputType>library</OutputType>
+ <PackageReleaseNotes>
+ToBeReleased
+- Marked EmptyDisposable as obsolete. #253
+- Target .NET 8.0. #252
+ </PackageReleaseNotes>
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" AllowedVersion="[4,)" />
- <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.0.1" AllowedVersion="[4,)" />
+ <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="[4,)" />
+ <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="[4,)" />
  <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
  <PackageReference Include="MsBuildPipeLogger.Server" Version="1.1.6" />
  <PackageReference Include="Microsoft.Build" Version="17.0.1" />
  <PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.0.1" />
+ <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
  <PackageReference Include="MSBuild.StructuredLogger" Version="2.1.815" Aliases="StructuredLogger" />
+ <PackageReference Include="MsBuildPipeLogger.Server" Version="1.1.6" />
  <PackageReference Include="NuGet.Frameworks" Version="6.9.1" />
  </ItemGroup>
 
@@ -30,4 +40,8 @@
  <ProjectReference Include="..\Buildalyzer.Logger\Buildalyzer.Logger.csproj" />
  </ItemGroup>
 
+ <ItemGroup Label="Additional files">
+ <AdditionalFiles Include="*.csproj" Visible="false" />
+ </ItemGroup>
+
 </Project>
diff --git a/tests/Buildalyzer.Tests/Buildalyzer.Tests.csproj b/tests/Buildalyzer.Tests/Buildalyzer.Tests.csproj
@@ -2,7 +2,8 @@
 
  <PropertyGroup>
  <TargetFramework>net8.0</TargetFramework>
- <LangVersion>12</LangVersion>
+ <IsPackable>false</IsPackable>
+ <OutputType>library</OutputType>
  </PropertyGroup>
 
  <ItemGroup Label="Test versions">
@@ -14,21 +15,26 @@
  <ItemGroup>
  <PackageReference Include="FluentAssertions" Version="6.12.0" />
  <PackageReference Include="LibGit2Sharp" Version="0.27.0-preview-0175" />
- <PackageReference Include="NUnit" Version="4.0.1" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+ <PackageReference Include="MsBuildPipeLogger.Logger" Version="1.1.6" GeneratePathProperty="true" />
+ <PackageReference Include="NUnit" Version="4.1.0" />
  <PackageReference Include="NUnit3TestAdapter" Version="*" PrivateAssets="all" />
  <PackageReference Include="Shouldly" Version="4.2.1" />
- <PackageReference Include="MsBuildPipeLogger.Logger" Version="1.1.6" GeneratePathProperty="true" />
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
- </ItemGroup>
+ </ItemGroup>
 
  <ItemGroup Label="Analyzers">
+ <PackageReference Include="FluentAssertions.Analyzers" Version="*" PrivateAssets="all" />
  <PackageReference Include="NUnit.Analyzers" Version="*" PrivateAssets="all" />
  </ItemGroup>
 
  <ItemGroup>
  <ProjectReference Include="..\..\src\Buildalyzer\Buildalyzer.csproj" />
  </ItemGroup>
 
+ <ItemGroup Label="Additional files">
+ <AdditionalFiles Include="*.csproj" Visible="false" />
+ </ItemGroup>
+
  <PropertyGroup Condition=" $([MSBuild]::IsOsPlatform('Windows')) ">
  <DefineConstants>Is_Windows</DefineConstants>
  </PropertyGroup>

diff --git a/tests/Buildalyzer.Workspaces.Tests/Buildalyzer.Workspaces.Tests.csproj b/tests/Buildalyzer.Workspaces.Tests/Buildalyzer.Workspaces.Tests.csproj
@@ -2,25 +2,32 @@
 
  <PropertyGroup>
  <TargetFramework>net8.0</TargetFramework>
- <LangVersion>12</LangVersion>
+ <IsPackable>false</IsPackable>
+ <OutputType>library</OutputType>
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="NUnit" Version="4.0.1" />
+ <PackageReference Include="FluentAssertions" Version="6.12.0" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+ <PackageReference Include="MsBuildPipeLogger.Logger" Version="1.1.6" GeneratePathProperty="true" />
+ <PackageReference Include="NUnit" Version="4.1.0" />
  <PackageReference Include="NUnit3TestAdapter" Version="*" PrivateAssets="all" />
  <PackageReference Include="Shouldly" Version="4.2.1" />
- <PackageReference Include="MsBuildPipeLogger.Logger" Version="1.1.6" GeneratePathProperty="true" />
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
  </ItemGroup>
 
  <ItemGroup Label="Analyzers">
- <PackageReference Include="NUnit.Analyzers" Version="*" PrivateAssets="all"/>
+ <PackageReference Include="FluentAssertions.Analyzers" Version="*" PrivateAssets="all" />
+ <PackageReference Include="NUnit.Analyzers" Version="*" PrivateAssets="all" />
  </ItemGroup>
 
  <ItemGroup>
  <ProjectReference Include="..\..\src\Buildalyzer.Workspaces\Buildalyzer.Workspaces.csproj" />
  </ItemGroup>
 
+ <ItemGroup Label="Additional files">
+ <AdditionalFiles Include="*.csproj" Visible="false" />
+ </ItemGroup>
+
  <PropertyGroup Condition=" $([MSBuild]::IsOsPlatform('Windows')) ">
  <DefineConstants>Is_Windows</DefineConstants>
  </PropertyGroup>