Use dev certs

- Also update tfms
2018-10-12 16:55:49 -07:00 · 2018-10-12 16:55:49 -07:00 · cc45d0cb41
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@ -1,6 +1,5 @@
 <Project>
  <PropertyGroup>
-    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">$(MicrosoftNETCoreApp21PackageVersion)</RuntimeFrameworkVersion>
    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">$(MicrosoftNETCoreApp22PackageVersion)</RuntimeFrameworkVersion>
    <NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
--- a/benchmarks/Kestrel.Performance/Kestrel.Performance.csproj
+++ b/benchmarks/Kestrel.Performance/Kestrel.Performance.csproj
@ -4,7 +4,7 @@
    <!-- Using shorter assembly name instead of Microsoft.AspNetCore.Server.Kestrel.Performance because https://github.com/dotnet/BenchmarkDotNet/issues/498 -->
    <AssemblyName>Kestrel.Performance</AssemblyName>
    <RootNamespace>Microsoft.AspNetCore.Server.Kestrel.Performance</RootNamespace>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
    <OutputType>Exe</OutputType>
    <ServerGarbageCollection>true</ServerGarbageCollection>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
--- a/benchmarks/Kestrel.Performance/README.md
+++ b/benchmarks/Kestrel.Performance/README.md
@ -4,10 +4,10 @@ build /t:compile /p:Configuration=Release
 ```
 To run a specific benchmark add it as parameter
 ```
-dotnet run -f netcoreapp2.0 -c Release RequestParsing
+dotnet run -f netcoreapp2.1 -c Release RequestParsing
 ```
 To run all use `All` as parameter
 ```
-dotnet run -f netcoreapp2.0 -c Release All
+dotnet run -f netcoreapp2.1 -c Release All
 ```
 Using no parameter will list all available benchmarks
--- a/build/dependencies.props
+++ b/build/dependencies.props
@ -29,7 +29,6 @@
    <MicrosoftExtensionsLoggingTestingPackageVersion>2.2.0-preview3-35457</MicrosoftExtensionsLoggingTestingPackageVersion>
    <MicrosoftExtensionsOptionsPackageVersion>2.2.0-preview3-35457</MicrosoftExtensionsOptionsPackageVersion>
    <MicrosoftInternalAspNetCoreH2SpecAllPackageVersion>2.1.1</MicrosoftInternalAspNetCoreH2SpecAllPackageVersion>
-    <MicrosoftNETCoreApp20PackageVersion>2.0.9</MicrosoftNETCoreApp20PackageVersion>
    <MicrosoftNETCoreApp21PackageVersion>2.1.3</MicrosoftNETCoreApp21PackageVersion>
    <MicrosoftNETCoreApp22PackageVersion>2.2.0-preview3-27008-03</MicrosoftNETCoreApp22PackageVersion>
    <MicrosoftNetHttpHeadersPackageVersion>2.2.0-preview3-35457</MicrosoftNetHttpHeadersPackageVersion>
--- a/build/repo.props
+++ b/build/repo.props
@ -10,7 +10,6 @@
  </PropertyGroup>

  <ItemGroup>
-    <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" />
    <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)" />
    <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp22PackageVersion)" />
  </ItemGroup>
--- a/samples/Http2SampleApp/Http2SampleApp.csproj
+++ b/samples/Http2SampleApp/Http2SampleApp.csproj
@ -14,10 +14,4 @@
    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
  </ItemGroup>

-  <ItemGroup>
-    <Content Include="testCert.pfx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
 </Project>
--- a/samples/Http2SampleApp/Program.cs
+++ b/samples/Http2SampleApp/Program.cs
@ -42,7 +42,7 @@ namespace Http2SampleApp
                    options.Listen(IPAddress.Any, basePort + 1, listenOptions =>
                    {
                        listenOptions.Protocols = HttpProtocols.Http1AndHttp2;
-                        listenOptions.UseHttps("testCert.pfx", "testPassword");
+                        listenOptions.UseHttps();
                        listenOptions.ConnectionAdapters.Add(new TlsFilterAdapter());
                    });

--- a/samples/Http2SampleApp/testCert.pfx
+++ b/samples/Http2SampleApp/testCert.pfx
--- a/samples/SampleApp/SampleApp.csproj
+++ b/samples/SampleApp/SampleApp.csproj
@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
    <TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
@ -17,12 +17,6 @@
    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
  </ItemGroup>

-  <ItemGroup>
-    <Content Include="testCert.pfx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
  <ItemGroup>
    <Content Update="appsettings.Development.json">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
--- a/samples/SampleApp/Startup.cs
+++ b/samples/SampleApp/Startup.cs
@ -106,7 +106,7 @@ namespace SampleApp

                    options.Listen(IPAddress.Loopback, basePort + 1, listenOptions =>
                    {
-                        listenOptions.UseHttps("testCert.pfx", "testPassword");
+                        listenOptions.UseHttps();
                        listenOptions.UseConnectionLogging();
                    });

--- a/samples/SampleApp/appsettings.Production.json
+++ b/samples/SampleApp/appsettings.Production.json
@ -4,10 +4,6 @@
      "NamedEndpoint": { "Url": "http://*:6000" },
      "NamedHttpsEndpoint": {
        "Url": "https://*:6443",
-        "Certificate": {
-          "Path": "testCert.pfx",
-          "Password": "testPassword"
-        }
      }
    }
  }
--- a/samples/SampleApp/testCert.pfx
+++ b/samples/SampleApp/testCert.pfx
--- a/samples/SystemdTestApp/Startup.cs
+++ b/samples/SystemdTestApp/Startup.cs
@ -64,7 +64,7 @@ namespace SystemdTestApp

                    options.Listen(IPAddress.Loopback, basePort + 1, listenOptions =>
                    {
-                        listenOptions.UseHttps("testCert.pfx", "testPassword");
+                        listenOptions.UseHttps();
                        listenOptions.UseConnectionLogging();
                    });

--- a/samples/SystemdTestApp/SystemdTestApp.csproj
+++ b/samples/SystemdTestApp/SystemdTestApp.csproj
@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
    <TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
@ -15,10 +15,4 @@
    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
  </ItemGroup>

-  <ItemGroup>
-    <Content Include="testCert.pfx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
 </Project>
--- a/samples/SystemdTestApp/testCert.pfx
+++ b/samples/SystemdTestApp/testCert.pfx
--- a/tools/CodeGenerator/CodeGenerator.csproj
+++ b/tools/CodeGenerator/CodeGenerator.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
    <OutputType>Exe</OutputType>
    <IsPackable>false</IsPackable>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>