Skip to content

Commit 23e1339

Browse files
Add a target for net5.0 (#46)
* Temporary target of net5.0 until v4 * Tests also need to be 5.0 for builds * Revert "Tests also need to be 5.0 for builds" This reverts commit f358ffc. * CI needs correct SDK * Revert "Revert "Tests also need to be 5.0 for builds"" This reverts commit 706fcc6. * net5.0 for v3 only * Revert "net5.0 for v3 only" This reverts commit 9711b29. * better net5.0 for v3 only * typo * revert better net5.0 for v3 only
1 parent 3507cb8 commit 23e1339

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

.github/workflows/publish-nuget-packages.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- uses: actions/checkout@v1
1212
- uses: actions/setup-dotnet@v1
1313
with:
14-
dotnet-version: '3.0.100'
14+
dotnet-version: '5.0.100'
1515
- run: dotnet pack src/prometheus-net.DotNetRuntime --include-symbols -c "ReleaseV2" --output "build/"
1616
- run: dotnet nuget push "build/prometheus-net.DotNetRuntime.2.*.symbols.nupkg" -k ${{ secrets.NUGET_API_KEY }} -s "https://api.nuget.org/v3/index.json" -n true
1717

@@ -22,6 +22,6 @@ jobs:
2222
- uses: actions/checkout@v1
2323
- uses: actions/setup-dotnet@v1
2424
with:
25-
dotnet-version: '3.0.100'
25+
dotnet-version: '5.0.100'
2626
- run: dotnet pack src/prometheus-net.DotNetRuntime --include-symbols -c "ReleaseV3" --output "build/"
2727
- run: dotnet nuget push "build/prometheus-net.DotNetRuntime.3.*.symbols.nupkg" -k ${{ secrets.NUGET_API_KEY }} -s "https://api.nuget.org/v3/index.json" -n true

.github/workflows/run-tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- uses: actions/checkout@v1
1313
- uses: actions/setup-dotnet@v1
1414
with:
15-
dotnet-version: '3.0.100'
15+
dotnet-version: '5.0.100'
1616
# excluding When_IO_work_is_executed_on_the_thread_pool_then_the_number_of_io_threads_is_measured for now, for some reason we don't seem to be
1717
# generating IO thread events in the github actions environment
1818
- run: dotnet test -c "DebugV2" --filter Name!=When_IO_work_is_executed_on_the_thread_pool_then_the_number_of_io_threads_is_measured
@@ -23,5 +23,5 @@ jobs:
2323
- uses: actions/checkout@v1
2424
- uses: actions/setup-dotnet@v1
2525
with:
26-
dotnet-version: '3.0.100'
26+
dotnet-version: '5.0.100'
2727
- run: dotnet test -c "DebugV3" --filter Name!=When_IO_work_is_executed_on_the_thread_pool_then_the_number_of_io_threads_is_measured

src/prometheus-net.DotNetRuntime.Tests/prometheus-net.DotNetRuntime.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="../Common.csproj"/>
33

44
<PropertyGroup>
5-
<TargetFramework>netcoreapp3.0</TargetFramework>
5+
<TargetFramework>net5.0</TargetFramework>
66
<IsPackable>false</IsPackable>
77
<RootNamespace>Prometheus.DotNetRuntime.Tests</RootNamespace>
88
<Platforms>AnyCPU</Platforms>

src/prometheus-net.DotNetRuntime/prometheus-net.DotNetRuntime.csproj

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<AssemblyName>prometheus-net.DotNetRuntime</AssemblyName>
77
<PackageId>prometheus-net.DotNetRuntime</PackageId>
88
<!-- TODO use git versioning -->
9-
<Version>$(PromMajorVersion).4.0</Version>
9+
<Version>$(PromMajorVersion).4.1</Version>
1010
<Authors>James Luck</Authors>
1111
<PackageTags>Prometheus prometheus-net IOnDemandCollector runtime metrics gc jit threadpool contention stats</PackageTags>
1212
<PackageProjectUrl>https://github.com/djluck/prometheus-net.DotNetRuntime</PackageProjectUrl>
@@ -16,16 +16,15 @@
1616
<PackageLicense>https://github.com/djluck/prometheus-net.DotNetRuntime/blob/master/LICENSE.txt</PackageLicense>
1717
<Configurations>ReleaseV2;DebugV2;DebugV3;ReleaseV3</Configurations>
1818
<Platforms>AnyCPU</Platforms>
19-
<TargetFrameworks>netcoreapp2.2;netcoreapp3.0;netstandard2.1</TargetFrameworks>
20-
<LangVersion>8</LangVersion>
19+
<TargetFrameworks>netcoreapp2.2;netcoreapp3.0;netstandard2.1;net5.0</TargetFrameworks>
2120
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
2221
<NoWarn>1701;1702;CS1591;</NoWarn>
2322
</PropertyGroup>
2423

2524
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
2625
<PackageReference Include="System.Collections.Immutable" Version="1.6.0" />
2726
</ItemGroup>
28-
27+
2928
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseV2' ">
3029
<DocumentationFile>bin\ReleaseV2\prometheus-net.DotNetRuntime.xml</DocumentationFile>
3130
</PropertyGroup>

0 commit comments

Comments
 (0)