Skip to content

Commit 2da8ab9

Browse files
committed
Add support for netstandard1.3
1 parent 98f4a43 commit 2da8ab9

File tree

68 files changed

+394
-760
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+394
-760
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*.suo
66
*.user
77
*.sln.docstates
8+
.vs/
89

910
# Build results
1011
[Dd]ebug/

.travis.yml

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
language: csharp
22
solution: prometheus-net.sln
33
install:
4-
- nuget restore prometheus-net.sln
5-
- nuget install NUnit.Runners -Version 3.0.1 -OutputDirectory testrunner
4+
- dotnet restore prometheus-net.sln
65
script:
7-
- xbuild /p:Configuration=Release prometheus-net.sln
8-
- ls -la
9-
- ls -la testrunner
10-
- find . -name "prometheus-net.tests.dll"
11-
- mono ./testrunner/NUnit.Console.3.0.1/tools/nunit3-console.exe ./prometheus-net.NET40.tests/bin/Release/prometheus-net.tests.dll
12-
- mono ./testrunner/NUnit.Console.3.0.1/tools/nunit3-console.exe ./prometheus-net.NET45.tests/bin/Release/prometheus-net.tests.dll
6+
- dotnet test --configuration Release "prometheus-net.tests/prometheus-net.tests.csproj"

GlobalAssemblyInfo.cs

-10
This file was deleted.

deploy_nuget.bat

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
set version=%1
22
::todo: use FAKE
3-
::C:\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild prometheus-net.sln /p:Configuration=Release
4-
"C:\Program Files (x86)\MSBuild\14.0\Bin\msbuild" prometheus-net.sln /p:Configuration=Release
5-
nuget pack prometheus-net.nuspec -properties version="%version%"
3+
dotnet pack prometheus-net/prometheus-net.csproj --configuration Release /p:Version="%version%"

prometheus-net.NET40.tests/Properties/AssemblyInfo.cs

-36
This file was deleted.

prometheus-net.NET40.tests/packages.config

-8
This file was deleted.

prometheus-net.NET40.tests/prometheus-net.NET40.tests.csproj

-82
This file was deleted.

prometheus-net.NET40/Properties/AssemblyInfo.cs

-8
This file was deleted.

prometheus-net.NET40/packages.config

-5
This file was deleted.

prometheus-net.NET40/prometheus-net.NET40.csproj

-73
This file was deleted.

prometheus-net.NET45.tests/Properties/AssemblyInfo.cs

-36
This file was deleted.

prometheus-net.NET45.tests/packages.config

-12
This file was deleted.

0 commit comments

Comments
 (0)