Skip to content

Commit

Permalink
Add a target for net5.0 (#46)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
dustinchilson authored Nov 25, 2020
1 parent 3507cb8 commit 23e1339
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/publish-nuget-packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- uses: actions/checkout@v1
- uses: actions/setup-dotnet@v1
with:
dotnet-version: '3.0.100'
dotnet-version: '5.0.100'
- run: dotnet pack src/prometheus-net.DotNetRuntime --include-symbols -c "ReleaseV2" --output "build/"
- 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

Expand All @@ -22,6 +22,6 @@ jobs:
- uses: actions/checkout@v1
- uses: actions/setup-dotnet@v1
with:
dotnet-version: '3.0.100'
dotnet-version: '5.0.100'
- run: dotnet pack src/prometheus-net.DotNetRuntime --include-symbols -c "ReleaseV3" --output "build/"
- 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
4 changes: 2 additions & 2 deletions .github/workflows/run-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v1
- uses: actions/setup-dotnet@v1
with:
dotnet-version: '3.0.100'
dotnet-version: '5.0.100'
# 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
# generating IO thread events in the github actions environment
- run: dotnet test -c "DebugV2" --filter Name!=When_IO_work_is_executed_on_the_thread_pool_then_the_number_of_io_threads_is_measured
Expand All @@ -23,5 +23,5 @@ jobs:
- uses: actions/checkout@v1
- uses: actions/setup-dotnet@v1
with:
dotnet-version: '3.0.100'
dotnet-version: '5.0.100'
- run: dotnet test -c "DebugV3" --filter Name!=When_IO_work_is_executed_on_the_thread_pool_then_the_number_of_io_threads_is_measured
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Import Project="../Common.csproj"/>

<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<IsPackable>false</IsPackable>
<RootNamespace>Prometheus.DotNetRuntime.Tests</RootNamespace>
<Platforms>AnyCPU</Platforms>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<AssemblyName>prometheus-net.DotNetRuntime</AssemblyName>
<PackageId>prometheus-net.DotNetRuntime</PackageId>
<!-- TODO use git versioning -->
<Version>$(PromMajorVersion).4.0</Version>
<Version>$(PromMajorVersion).4.1</Version>
<Authors>James Luck</Authors>
<PackageTags>Prometheus prometheus-net IOnDemandCollector runtime metrics gc jit threadpool contention stats</PackageTags>
<PackageProjectUrl>https://github.com/djluck/prometheus-net.DotNetRuntime</PackageProjectUrl>
Expand All @@ -16,16 +16,15 @@
<PackageLicense>https://github.com/djluck/prometheus-net.DotNetRuntime/blob/master/LICENSE.txt</PackageLicense>
<Configurations>ReleaseV2;DebugV2;DebugV3;ReleaseV3</Configurations>
<Platforms>AnyCPU</Platforms>
<TargetFrameworks>netcoreapp2.2;netcoreapp3.0;netstandard2.1</TargetFrameworks>
<LangVersion>8</LangVersion>
<TargetFrameworks>netcoreapp2.2;netcoreapp3.0;netstandard2.1;net5.0</TargetFrameworks>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>1701;1702;CS1591;</NoWarn>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
<PackageReference Include="System.Collections.Immutable" Version="1.6.0" />
</ItemGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseV2' ">
<DocumentationFile>bin\ReleaseV2\prometheus-net.DotNetRuntime.xml</DocumentationFile>
</PropertyGroup>
Expand Down

0 comments on commit 23e1339

Please sign in to comment.