Housekeeping: Update to Net6, remove unnecessary packages, update pac…

…kages as required (#202) * Update to Net6, remove unnecessary packages, update packages as required * Update ci-build.yml * Update release.yml * Update ci-build.yml * Update release.yml * Update ReactiveMarbles.PropertyChanged.Tests.csproj * Update ReactiveMarbles.PropertyChanged.SourceGenerator.Builders.csproj * Update ReactiveMarbles.PropertyChanged.SourceGenerator.Benchmarks.csproj Co-authored-by: Glenn <[email protected]>
reactivemarbles · Jun 13, 2022 · 1ac5496 · 1ac5496
1 parent 6784ddb
commit 1ac5496
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 42 deletions.
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -22,21 +22,10 @@ jobs:
  fetch-depth: 0
  lfs: true
 
- - name: Install .NET Core
- uses: actions/[email protected]
- with:
- dotnet-version: 3.1.x
-
- - name: Install .NET 5
- uses: actions/[email protected]
- with:
- dotnet-version: 5.0.x
-
  - name: Install .NET 6
  uses: actions/[email protected]
  with:
  dotnet-version: 6.0.x
- include-prerelease: true
 
  - uses: nuget/setup-nuget@v1
  name: Setup NuGet
@@ -49,9 +38,8 @@ jobs:
  dotnet workload install tvos
  dotnet workload install macos
  dotnet workload install maui
- dotnet tool install -g Redth.Net.Maui.Check
- maui-check --non-interactive --fix
-
+ dotnet workload install maccatalyst
+ 
  - name: Add MSBuild to PATH
  uses: glennawatson/[email protected]
  with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,16 +22,6 @@ jobs:
  fetch-depth: 0
  lfs: true
 
- - name: Install .NET Core
- uses: actions/[email protected]
- with:
- dotnet-version: 3.1.x
-
- - name: Install .NET 5
- uses: actions/[email protected]
- with:
- dotnet-version: 5.0.x
-
  - name: Install .NET 6
  uses: actions/[email protected]
  with:
@@ -49,9 +39,8 @@ jobs:
  dotnet workload install tvos
  dotnet workload install macos
  dotnet workload install maui
- dotnet tool install -g Redth.Net.Maui.Check
- maui-check --non-interactive --fix
-
+ dotnet workload install maccatalyst
+ 
  - name: Add MSBuild to PATH
  uses: glennawatson/[email protected]
  with:

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -23,6 +23,8 @@
  <EmbedUntrackedSources>true</EmbedUntrackedSources>
  <!-- Include PDB in the built .nupkg -->
  <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+ <EnableNETAnalyzers>True</EnableNETAnalyzers>
+ <AnalysisLevel>latest</AnalysisLevel>
  </PropertyGroup>
 
  <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
@@ -48,7 +50,7 @@
 
  <ItemGroup>
  <PackageReference Include="stylecop.analyzers" Version="1.2.0-beta.435" PrivateAssets="all" />
- <PackageReference Include="Roslynator.Analyzers" Version="3.2.2" PrivateAssets="All" />
+ <PackageReference Include="Roslynator.Analyzers" Version="4.1.1" PrivateAssets="All" />
  <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0" PrivateAssets="all" />
  </ItemGroup>
  <ItemGroup>

diff --git a/...ctiveMarbles.PropertyChanged.Benchmarks/ReactiveMarbles.PropertyChanged.Benchmarks.csproj b/...ctiveMarbles.PropertyChanged.Benchmarks/ReactiveMarbles.PropertyChanged.Benchmarks.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
  <OutputType>Exe</OutputType>
- <TargetFramework>net5.0</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
  <IsPackable>false</IsPackable>
  <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
  <CompilerGeneratedFilesOutputPath>$(BaseIntermediateOutputPath)\GeneratedFiles</CompilerGeneratedFilesOutputPath>

diff --git a/...rceGenerator.Benchmarks/ReactiveMarbles.PropertyChanged.SourceGenerator.Benchmarks.csproj b/...rceGenerator.Benchmarks/ReactiveMarbles.PropertyChanged.SourceGenerator.Benchmarks.csproj
@@ -8,9 +8,9 @@
 
  <ItemGroup>
  <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
+ <PackageReference Include="System.Reactive" Version="5.0.0" />
  <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="3.11.0" />
  <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.11.0" />
- <PackageReference Include="System.Reactive" Version="5.0.0" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/....SourceGenerator.Builders/ReactiveMarbles.PropertyChanged.SourceGenerator.Builders.csproj b/....SourceGenerator.Builders/ReactiveMarbles.PropertyChanged.SourceGenerator.Builders.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
  <TargetFramework>netstandard2.0</TargetFramework>
@@ -13,7 +13,6 @@
 
  <ItemGroup>
  <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.11.0" PrivateAssets="all" />
- <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
  <PackageReference Include="ReactiveMarbles.SourceGenerator.TestNuGetHelper" Version="1.2.1" />
  </ItemGroup>
 

diff --git a/...hanged.SourceGenerator.Tests/ReactiveMarbles.PropertyChanged.SourceGenerator.Tests.csproj b/...hanged.SourceGenerator.Tests/ReactiveMarbles.PropertyChanged.SourceGenerator.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFrameworks>net5.0</TargetFrameworks>
+ <TargetFrameworks>net6.0</TargetFrameworks>
 
  <IsPackable>false</IsPackable>
  <NoWarn>$(NoWarn);SA1600</NoWarn>

diff --git a/src/ReactiveMarbles.PropertyChanged.SourceGenerator/AnalyzerReleases.Unshipped.md b/src/ReactiveMarbles.PropertyChanged.SourceGenerator/AnalyzerReleases.Unshipped.md
@@ -1,2 +1,14 @@
 ; Unshipped analyzer release
 ; https://github.com/dotnet/roslyn-analyzers/blob/master/src/Microsoft.CodeAnalysis.Analyzers/ReleaseTrackingAnalyzers.Help.md
+
+### Removed Rules
+
+Rule ID | Category | Severity | Notes
+--------|----------|----------|--------------------
+RXM001 | Compiler | Error | 
+RXM002 | Compiler | Error | 
+RXM003 | Compiler | Error | 
+RXM004 | Compiler | Error | 
+RXM005 | Compiler | Error | 
+RXM006 | Compiler | Error |
+RXM007 | Compiler | Error |
diff --git a/...es.PropertyChanged.SourceGenerator/ReactiveMarbles.PropertyChanged.SourceGenerator.csproj b/...es.PropertyChanged.SourceGenerator/ReactiveMarbles.PropertyChanged.SourceGenerator.csproj
@@ -13,11 +13,9 @@
  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
  <Nullable>enable</Nullable>
  <DebugType>full</DebugType>
- <EnableNETAnalyzers>True</EnableNETAnalyzers>
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" GeneratePathProperty="true" />
  <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="3.11.0" PrivateAssets="all" GeneratePathProperty="true" />
  <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.11.0" PrivateAssets="all" GeneratePathProperty="true" />
  <PackageReference Include="ReactiveMarbles.RoslynHelpers" Version="1.1.1" GeneratePathProperty="true" PrivateAssets="all" />
@@ -42,8 +40,7 @@
  <DependentUpon>Constants.When.tt</DependentUpon>
  </Compile>
  </ItemGroup>
-
-
+
  <Target Name="ILRepack" AfterTargets="Build">
  <Exec Command="$(PKGILRepack)\tools\ILRepack &quot;$(TargetPath)&quot; &quot;$(PKGReactiveMarbles_RoslynHelpers)\lib\netstandard2.0\ReactiveMarbles.RoslynHelpers.dll&quot; /out:&quot;$(TargetPath)&quot; /lib:&quot;$(PKGMicrosoft_CodeAnalysis_CSharp_Workspaces)\lib\netstandard2.0&quot; /lib:&quot;$(PKGMicrosoft_CodeAnalysis_Analyzers)\analyzers\dotnet\cs&quot; /lib:&quot;$(PKGMicrosoft_CodeAnalysis_Common)\lib\netstandard2.0&quot; /union /internalize" />
  </Target>

diff --git a/src/ReactiveMarbles.PropertyChanged.Tests/ReactiveMarbles.PropertyChanged.Tests.csproj b/src/ReactiveMarbles.PropertyChanged.Tests/ReactiveMarbles.PropertyChanged.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+ <TargetFrameworks>net6.0</TargetFrameworks>
 
  <IsPackable>false</IsPackable>
  <NoWarn>$(NoWarn);SA1600</NoWarn>
@@ -17,7 +17,6 @@
  <ItemGroup>
  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
  <PackageReference Include="xunit" Version="2.4.1" />
- <PackageReference Include="xunit.runner.console" Version="2.4.1" />
  <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
  <PackageReference Include="Xunit.StaFact" Version="1.1.11" />
  <PackageReference Include="PublicApiGenerator" Version="10.3.0" />

diff --git a/src/ReactiveMarbles.PropertyChanged/ReactiveMarbles.PropertyChanged.csproj b/src/ReactiveMarbles.PropertyChanged/ReactiveMarbles.PropertyChanged.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="MSBuild.Sdk.Extras">
 
  <PropertyGroup>
- <TargetFrameworks>netstandard2.0;Xamarin.iOS10;Xamarin.TVOS10;Xamarin.WatchOS10;net5.0</TargetFrameworks>
- <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461</TargetFrameworks>
+ <TargetFrameworks>netstandard2.0;Xamarin.iOS10;Xamarin.TVOS10;Xamarin.WatchOS10;net6.0</TargetFrameworks>
+ <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net462</TargetFrameworks>
  <LangVersion>preview</LangVersion>
  </PropertyGroup>
 

diff --git a/src/global.json b/src/global.json
@@ -1,5 +1,5 @@
 {
  "msbuild-sdks": {
- "MSBuild.Sdk.Extras": "3.0.22"
+ "MSBuild.Sdk.Extras": "3.0.44"
  }
 }