Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Housekeeping: Update to Net6, rollback Code Analysis to 3.11.0 #58

Merged
merged 3 commits into from
Jun 12, 2022
Merged

Housekeeping: Update to Net6, rollback Code Analysis to 3.11.0 #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c74407f
Update to Net6, rollback CodeAnalysis to 3.11.0
ChrisPulman Jun 12, 2022
9ee3b70
Update ci-build.yml
glennawatson Jun 12, 2022
74db0ad
Update release.yml
glennawatson Jun 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 2 additions & 7 deletions .github/workflows/ci-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,10 @@ jobs:
fetch-depth: 0
lfs: true

- name: Install .NET Core
- name: Install .NET 6
uses: actions/setup-dotnet@v2.1.0
with:
dotnet-version: 3.1.x

- name: Install .NET 5
uses: actions/setup-dotnet@v2.1.0
with:
dotnet-version: 5.0.x
dotnet-version: 6.0.x

# - name: Update VS2019
# shell: powershell
Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,10 @@ jobs:
fetch-depth: 0
lfs: true

- name: Install .NET Core
- name: Install .NET 6
uses: actions/setup-dotnet@v2.1.0
with:
dotnet-version: 3.1.x

- name: Install .NET 5
uses: actions/setup-dotnet@v2.1.0
with:
dotnet-version: 5.0.x
dotnet-version: 6.0.x

- name: NBGV
id: nbgv
Expand Down
8 changes: 3 additions & 5 deletions src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
<PackageIcon>logo.png</PackageIcon>
<SolutionDir Condition="'$(SolutionDir)' == ''">$(MSBuildThisFileDirectory)</SolutionDir>
<EnableNETAnalyzers>True</EnableNETAnalyzers>
<AnalysisLevel>latest</AnalysisLevel>
</PropertyGroup>

<ItemGroup Condition="'$(IsTestProject)' != 'true'">
Expand All @@ -36,12 +38,8 @@

<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" Version="3.5.107" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="stylecop.analyzers" Version="1.2.0-beta.435" PrivateAssets="all" />
<PackageReference Include="Roslynator.Analyzers" Version="4.1.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0" PrivateAssets="all" />
<PackageReference Include="Roslynator.Analyzers" Version="4.1.1" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" />
Expand Down
4 changes: 2 additions & 2 deletions src/ReactiveMarbles.RoslynHelpers/ReactiveMarbles.RoslynHelpers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
<Authors>ReactiveUI Association Inc</Authors>
Expand All @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.11.0" />
</ItemGroup>

</Project>