Skip to content
This repository has been archived by the owner on Jun 4, 2024. It is now read-only.

Commit

Permalink
Upgrade to MSTest SDK v17 (#7)
Browse files Browse the repository at this point in the history
* Upgrade to MSTest SDK v17

* Drop < .Net 6.0

* Improve CI, impl build-config matrix, drop < .NET 6.0
  • Loading branch information
jburnett authored Jun 7, 2022
1 parent 27c77c5 commit 2b4f154
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 38 deletions.
23 changes: 9 additions & 14 deletions .github/workflows/dotnet-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@ name: .NET Core Builds

on:
push:
branches: [ master, dev ]
pull_request:
branches: [ master ]
pull_request:
branches: [ dev ]

jobs:
build:
strategy:
matrix:
build-config: [ Debug, Release ]

runs-on: ubuntu-latest

Expand All @@ -17,17 +20,9 @@ jobs:
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.100
- name: Setup .NET 5.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.403
- name: Setup .NET Core 3.1
uses: actions/setup-dotnet@v1
with:
dotnet-version: 3.1.415
- name: Install dependencies
run: dotnet restore
- name: Build
run: dotnet build --configuration Release --no-restore
- name: Test.Mutant
run: dotnet test --no-restore --verbosity normal ./test/test.csproj
- name: Build Mutant
run: dotnet build --configuration ${{ matrix.build-config }} --no-restore
- name: Test Mutant
run: dotnet test --configuration ${{ matrix.build-config }} --no-restore --verbosity normal ./test/test.csproj
13 changes: 1 addition & 12 deletions AMT.LinqExtensions/AMT.LinqExtensions.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,11 @@
<GenerateNeutralResourcesLanguageAttribute />

<Description>A few LINQ Extensions we find useful.</Description>
<PackageReleaseNotes>Supports .NET Core 3.1, .NET 5.0, &amp; .NET 6.0</PackageReleaseNotes>
<PackageReleaseNotes>Supports .NET 6.0</PackageReleaseNotes>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/AltaModaTech/LINQExtensions</PackageProjectUrl>
<PackageTags>LINQ</PackageTags>
<Title>LINQ Extensions by AltaModa Technologies</Title>
</PropertyGroup>

<!--
.NET 6.0 (LTS) EOL 11/8/2024
.NET Core 3.1 (LTS) EOL 12/3/2022
.NET 5.0 EOL 5/8/2022
.NET Core 2.1 (LTS) EOL 8/21/2021
.NET Core 1.1 EOL 6/27/2019
-->
<PropertyGroup>
<TargetFrameworks>netstandard2.1;net5.0;net6.0</TargetFrameworks>
</PropertyGroup>

</Project>
13 changes: 12 additions & 1 deletion common.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,22 @@

<!-- Assembly version & attribute controls -->
<PropertyGroup>
<VersionPrefix>3.2.0</VersionPrefix>
<VersionPrefix>4.0.0</VersionPrefix>

<GenerateAssemblyConfigurationAttribute>true</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>true</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>true</GenerateAssemblyProductAttribute>
</PropertyGroup>

<!--
.NET 6.0 (LTS) EOL 11/8/2024
.NET Core 3.1 (LTS) EOL 12/3/2022
.NET 5.0 EOL 5/8/2022
.NET Core 2.1 (LTS) EOL 8/21/2021
.NET Core 1.1 EOL 6/27/2019
-->
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
</PropertyGroup>

</Project>
11 changes: 0 additions & 11 deletions test/test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,6 @@
<IsPackable>false</IsPackable>
</PropertyGroup>

<!--
.NET 6.0 (LTS) EOL 11/8/2024
.NET Core 3.1 (LTS) EOL 12/3/2022
.NET 5.0 EOL 5/8/2022
.NET Core 2.1 (LTS) EOL 8/21/2021
.NET Core 1.1 EOL 6/27/2019
-->
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\AMT.LinqExtensions\AMT.LinqExtensions.csproj" />
</ItemGroup>
Expand Down

0 comments on commit 2b4f154

Please sign in to comment.