Skip to content
This repository was archived by the owner on Mar 8, 2025. It is now read-only.

Commit 91bc6dd

Browse files
jburnettjburnett
authored
Merge version 3.0 with .NET5.0 support (#3)
* Upgrade tasks version; incl MSTest SDK in tests * Rm'd NuGet config * Added publish NuGet pkgs script * Added net5.0 support * Upgrade version to 3.0 * Add build GitHub action
1 parent 66a6c6e commit 91bc6dd

8 files changed

Lines changed: 96 additions & 47 deletions

File tree

‎.github/workflows/dotnet-core.yml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: .NET Core Builds
2+
3+
on:
4+
push:
5+
branches: [ master, dev ]
6+
pull_request:
7+
branches: [ dev ]
8+
9+
jobs:
10+
build:
11+
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- uses: actions/checkout@v2
16+
- name: Setup .NET 5.0
17+
uses: actions/setup-dotnet@v1
18+
with:
19+
dotnet-version: 5.0.202
20+
- name: Setup .NET Core 3.1
21+
uses: actions/setup-dotnet@v1
22+
with:
23+
dotnet-version: 3.1.407
24+
- name: Setup .NET Core 2.1
25+
uses: actions/setup-dotnet@v1
26+
with:
27+
dotnet-version: 2.1.814
28+
- name: Install dependencies
29+
run: dotnet restore
30+
- name: Build
31+
run: dotnet build --configuration Release --no-restore
32+
- name: Test.Mutant
33+
run: dotnet test --no-restore --verbosity normal ./test/test.csproj

‎.vscode/launch.json‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎.vscode/tasks.json‎

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,35 @@
11
{
22
// See https://go.microsoft.com/fwlink/?LinkId=733558
33
// for the documentation about the tasks.json format
4-
"version": "0.1.0",
5-
"command": "dotnet",
6-
"isShellCommand": true,
7-
"args": [],
4+
"version": "2.0.0",
85
"tasks": [
96
{
10-
"taskName": "build",
11-
"args": [ "AMT.LinqExtensions" ],
12-
"isBuildCommand": true,
13-
"showOutput": "silent",
7+
"label": "build",
8+
"command": "dotnet",
9+
"type": "shell",
10+
"args": [
11+
"build",
12+
"/property:GenerateFullPaths=true",
13+
"/consoleloggerparameters:NoSummary"
14+
],
15+
"group": "build",
16+
"presentation": {
17+
"reveal": "silent"
18+
},
1419
"problemMatcher": "$msCompile"
20+
},
21+
{
22+
"label": "test",
23+
"command": "dotnet",
24+
"type": "shell",
25+
"args": [
26+
"test"
27+
],
28+
"group": {
29+
"kind": "test",
30+
"isDefault": true
31+
},
32+
"problemMatcher": []
1533
}
1634
]
1735
}

‎AMT.LinqExtensions/AMT.LinqExtensions.csproj‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<GenerateAssemblyVersionAttribute />
1616
<GenerateNeutralResourcesLanguageAttribute />
1717

18-
<Description>A few LINQ Extensions which we find useful, and you may, too.</Description>
19-
<PackageReleaseNotes>Supports .NET Core LTS versions 2.1, 3.1</PackageReleaseNotes>
18+
<Description>A few LINQ Extensions we find useful.</Description>
19+
<PackageReleaseNotes>Supports .NET 5.0 and .NET Core LTS versions 2.1, 3.1</PackageReleaseNotes>
2020
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
2121
<PackageProjectUrl>https://github.com/AltaModaTech/LINQExtensions</PackageProjectUrl>
2222
<PackageTags>LINQ</PackageTags>
@@ -28,11 +28,8 @@
2828
.NET Core 2.1 (LTS) EOL 8/21/2021
2929
.NET Core 1.1 EOL 6/27/2019
3030
-->
31-
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
32-
<TargetFrameworks>netstandard2.0;net461;net462;net47;net471;net472;</TargetFrameworks>
33-
</PropertyGroup>
34-
<PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
35-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
31+
<PropertyGroup>
32+
<TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
3633
</PropertyGroup>
3734

3835
</Project>

‎NuGet.config‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎Publish-Release.ps1‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
param (
2+
[Parameter(Mandatory=$true)][string]$apiKey
3+
)
4+
5+
$branch = invoke-expression "git branch --show-current"
6+
7+
if ($branch -ne 'master') {
8+
Write-Error "Publishing only allowed from master branch"
9+
exit
10+
}
11+
12+
$projPaths = @(
13+
"."
14+
)
15+
16+
# Ensure everything is built
17+
Write-Verbose "Pack projects"
18+
$projPaths | %{
19+
write-host "" # separator
20+
dotnet pack -c Release $_
21+
}
22+
23+
# Publish to NuGet
24+
Write-Verbose "Publish projects"
25+
$projPaths | %{
26+
write-host "" # separator
27+
$pkg = gci $_/bin/Release *.nupkg
28+
dotnet nuget push -k $apiKey $pkg.FullName -s https://api.nuget.org/v3/index.json
29+
}

‎common.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<!-- Assembly version & attribute controls -->
1212
<PropertyGroup>
13-
<VersionPrefix>2.3.0</VersionPrefix>
13+
<VersionPrefix>3.0.0</VersionPrefix>
1414

1515
<GenerateAssemblyConfigurationAttribute>true</GenerateAssemblyConfigurationAttribute>
1616
<GenerateAssemblyCompanyAttribute>true</GenerateAssemblyCompanyAttribute>

‎test/test.csproj‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,16 @@
1212
.NET Core 2.1 (LTS) EOL 8/21/2021
1313
.NET Core 1.1 EOL 6/27/2019
1414
-->
15-
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
16-
<TargetFrameworks>netcoreapp3.1;netcoreapp2.1;net461;net462;net47;net471;net472;</TargetFrameworks>
17-
</PropertyGroup>
18-
<PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
19-
<TargetFrameworks>netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
15+
<PropertyGroup>
16+
<TargetFrameworks>netcoreapp3.1;netcoreapp2.1;net5.0</TargetFrameworks>
2017
</PropertyGroup>
2118

2219
<ItemGroup>
2320
<ProjectReference Include="..\AMT.LinqExtensions\AMT.LinqExtensions.csproj" />
2421
</ItemGroup>
2522

2623
<ItemGroup>
24+
<PackageReference Include="Microsoft.NET.Test.SDK" Version="16.*" />
2725
<PackageReference Include="xunit.runner.visualstudio" Version="*" />
2826
<PackageReference Include="xunit" Version="*" />
2927
<PackageReference Include="FluentAssertions" Version="*" />

0 commit comments

Comments
 (0)