Skip to content

Commit

Permalink
Housekeeping Update packages (#127)
Browse files Browse the repository at this point in the history
* Housekeeping Update packages

* update build
  • Loading branch information
ChrisPulman authored Mar 19, 2024
1 parent 8918eaf commit b0070c0
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 33 deletions.
16 changes: 4 additions & 12 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,10 @@ jobs:
- name: Install .NET Core
uses: actions/setup-dotnet@v4
with:
dotnet-version: 3.1.x

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

- name: Install .NET 6
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
include-prerelease: true
dotnet-version: |
6.0.x
7.0.x
8.0.x
- name: NBGV
id: nbgv
Expand Down
16 changes: 4 additions & 12 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,10 @@ jobs:
- name: Install .NET Core
uses: actions/setup-dotnet@v4
with:
dotnet-version: 3.1.x

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

- name: Install .NET 6
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
include-prerelease: true
dotnet-version: |
6.0.x
7.0.x
8.0.x
- name: NBGV
id: nbgv
Expand Down
6 changes: 4 additions & 2 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@
<IsTestProject>$(MSBuildProjectName.Contains('Tests'))</IsTestProject>
<DebugType>embedded</DebugType>
<Authors>Glenn Watson;Rodney Littles II;Chris Pulman</Authors>
<Copyright>Copyright (c) 2021 ReactiveUI Association Inc</Copyright>
<PackageIcon>logo.png</PackageIcon>
<Copyright>Copyright (c) $([System.DateTime]::Now.ToString('yyyy')) ReactiveUI Association Inc</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/reactivemarbles/Locator</PackageProjectUrl>
<PackageDescription>A simple locator for Reactive Marbles. Used when performance is key over a full feature set.</PackageDescription>
<Owners>glennawatson;chrispulman;RLittlesII</Owners>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageIcon>logo.png</PackageIcon>
<PackageTags>locator;marbles;rx</PackageTags>
<PackageReleaseNotes>https://github.com/reactivemarbles/Locator/releases</PackageReleaseNotes>
<RepositoryUrl>https://github.com/reactivemarbles/Locator</RepositoryUrl>
Expand Down Expand Up @@ -40,6 +41,7 @@
<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)..\images\logo.png" Pack="true" PackagePath="\" />
<None Include="$(MSBuildThisFileDirectory)..\LICENSE" Pack="true" PackagePath="LICENSE" />
<None Include="$(MSBuildThisFileDirectory)..\README.md" Pack="true" PackagePath="\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
Expand All @@ -12,6 +12,7 @@
<DebugType>full</DebugType>
<LangVersion>preview</LangVersion>
<Nullable>enable</Nullable>
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ReactiveMarbles.Locator/ReactiveMarbles.Locator.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
<ProduceReferenceAssembly>True</ProduceReferenceAssembly>
Expand Down
10 changes: 5 additions & 5 deletions src/directory.packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<ItemGroup>
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
<PackageVersion Include="Roslynator.Analyzers" Version="4.11.0" />
<PackageVersion Include="Roslynator.Analyzers" Version="4.12.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0" />
</ItemGroup>

Expand All @@ -19,15 +19,15 @@
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="3.11.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.11.0" />
<PackageVersion Include="ReactiveMarbles.RoslynHelpers" Version="1.1.1" />
<PackageVersion Include="ILRepack" Version="2.0.27" />
<PackageVersion Include="ILRepack" Version="2.0.28" />
</ItemGroup>

<ItemGroup>
<PackageVersion Include="Tmds.ExecFunction" Version="0.7.1" />
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
<PackageVersion Include="xunit" Version="2.4.1" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.3" />
<PackageVersion Include="coverlet.collector" Version="6.0.1" />
<PackageVersion Include="xunit" Version="2.4.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit b0070c0

Please sign in to comment.