Update to netstandard2.1

nexogen-international · Feb 27, 2020 · 5c4e3cc · 5c4e3cc
1 parent 398eb3a
commit 5c4e3cc
Show file tree

Hide file tree

Showing 19 changed files with 46 additions and 408 deletions.
diff --git a/Nexogen.Libraries.Metrics.Example/Nexogen.Libraries.Metrics.Example.csproj b/Nexogen.Libraries.Metrics.Example/Nexogen.Libraries.Metrics.Example.csproj
diff --git a/Nexogen.Libraries.Metrics.Example/Program.cs b/Nexogen.Libraries.Metrics.Example/Program.cs
diff --git a/Nexogen.Libraries.Metrics.Extensions/Nexogen.Libraries.Metrics.Extensions.csproj b/Nexogen.Libraries.Metrics.Extensions/Nexogen.Libraries.Metrics.Extensions.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>$(PackageVersionNumber)</VersionPrefix>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
 
     <Description>Nexogen Metrics Extensions</Description>

diff --git a/...rometheus.AspCore.UnitTests/Nexogen.Libraries.Metrics.Prometheus.AspCore.UnitTests.csproj b/...rometheus.AspCore.UnitTests/Nexogen.Libraries.Metrics.Prometheus.AspCore.UnitTests.csproj
@@ -5,8 +5,11 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.2" />
     <PackageReference Include="microsoft.net.test.sdk" Version="15.0.0" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Nexogen.Libraries.Metrics.Prometheus.AspCore\Nexogen.Libraries.Metrics.Prometheus.AspCore.csproj" />

diff --git a/Nexogen.Libraries.Metrics.Prometheus.AspCore.UnitTests/Properties/launchSettings.json b/Nexogen.Libraries.Metrics.Prometheus.AspCore.UnitTests/Properties/launchSettings.json
@@ -0,0 +1,27 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:64054/",
+      "sslPort": 44392
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "Nexogen.Libraries.Metrics.Prometheus.AspCore.UnitTests": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "https://localhost:5001;http://localhost:5000"
+    }
+  }
+}
diff --git a/...es.Metrics.Prometheus.PushGateway/Nexogen.Libraries.Metrics.Prometheus.PushGateway.csproj b/...es.Metrics.Prometheus.PushGateway/Nexogen.Libraries.Metrics.Prometheus.PushGateway.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>$(PackageVersionNumber)</VersionPrefix>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
 
     <Description>Nexogen Metrics Prometheus PushGateway</Description>
@@ -12,10 +12,6 @@
     <Copyright>Nexogen 2017</Copyright>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="System.Net.Http" Version="4.3.3" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Nexogen.Libraries.Metrics.Prometheus\Nexogen.Libraries.Metrics.Prometheus.csproj" />
   </ItemGroup>

diff --git a/Nexogen.Libraries.Metrics.Prometheus.Standalone/ExposeExtension.cs b/Nexogen.Libraries.Metrics.Prometheus.Standalone/ExposeExtension.cs
diff --git a/...ries.Metrics.Prometheus.Standalone/Nexogen.Libraries.Metrics.Prometheus.Standalone.csproj b/...ries.Metrics.Prometheus.Standalone/Nexogen.Libraries.Metrics.Prometheus.Standalone.csproj
diff --git a/Nexogen.Libraries.Metrics.Prometheus.Standalone/PrometheusServer.cs b/Nexogen.Libraries.Metrics.Prometheus.Standalone/PrometheusServer.cs