Merge branch 'master' into merge/release/2.2-to-master

2018-08-28 14:08:12 -07:00 · 2018-08-28 14:08:12 -07:00 · 85b22edb6a
parent 624c2ecd28 4ced217d23
commit 85b22edb6a
33 changed files with 47 additions and 50 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@ -2,7 +2,7 @@ init:
 - git config --global core.autocrlf true
 branches:
  only:
-  - dev
+  - master
  - /^release\/.*$/
  - /^(.*\/)?ci-.*$/
 build_script:
--- a/.travis.yml
+++ b/.travis.yml
@ -16,7 +16,7 @@ addons:
    - libunwind8
 branches:
  only:
-  - dev
+  - master
  - /^release\/.*$/
  - /^(.*\/)?ci-.*$/
 before_install:
--- a/.vsts-pipelines/builds/ci-internal.yml
+++ b/.vsts-pipelines/builds/ci-internal.yml
@ -7,7 +7,7 @@ resources:
  - repository: buildtools
    type: git
    name: aspnet-BuildTools
-    ref: refs/heads/release/2.2
+    ref: refs/heads/master

 phases:
 - template: .vsts-pipelines/templates/project-ci.yml@buildtools
--- a/.vsts-pipelines/builds/ci-public.yml
+++ b/.vsts-pipelines/builds/ci-public.yml
@ -9,7 +9,7 @@ resources:
    type: github
    endpoint: DotNet-Bot GitHub Connection
    name: aspnet/BuildTools
-    ref: refs/heads/release/2.2
+    ref: refs/heads/master

 phases:
 - template: .vsts-pipelines/templates/project-ci.yml@buildtools
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,4 +1,4 @@
 Contributing
 ======

-Information on contributing to this repo is in the [Contributing Guide](https://github.com/aspnet/Home/blob/dev/CONTRIBUTING.md) in the Home repo.
+Information on contributing to this repo is in the [Contributing Guide](https://github.com/aspnet/Home/blob/master/CONTRIBUTING.md) in the Home repo.
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@ -1,7 +1,6 @@
 <Project>
  <PropertyGroup>
-    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">$(MicrosoftNETCoreApp21PackageVersion)</RuntimeFrameworkVersion>
-    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">$(MicrosoftNETCoreApp22PackageVersion)</RuntimeFrameworkVersion>
+    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreApp30PackageVersion)</RuntimeFrameworkVersion>
    <NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
    <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
    <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
--- a/NuGetPackageVerifier.json
+++ b/NuGetPackageVerifier.json
@ -41,7 +41,7 @@
      "Microsoft.AspNetCore.DeveloperCertificates.XPlat": {
        "Exclusions": {
          "DOC_MISSING": {
-            "lib/netcoreapp2.2/Microsoft.AspNetCore.DeveloperCertificates.XPlat.dll": "Docs not required to shipoob package"
+            "lib/netcoreapp3.0/Microsoft.AspNetCore.DeveloperCertificates.XPlat.dll": "Docs not required to shipoob package"
          }
        }
      }
--- a/build/dependencies.props
+++ b/build/dependencies.props
@ -3,20 +3,18 @@
    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
  </PropertyGroup>
  <PropertyGroup Label="Package Versions">
-    <InternalAspNetCoreSdkPackageVersion>2.2.0-preview1-20180807.2</InternalAspNetCoreSdkPackageVersion>
-    <MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>2.2.0-preview1-34967</MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>
-    <MicrosoftAspNetCoreTestingPackageVersion>2.2.0-preview1-34967</MicrosoftAspNetCoreTestingPackageVersion>
-    <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>2.2.0-preview1-34967</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
-    <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>2.2.0-preview1-34967</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
-    <MicrosoftExtensionsProcessSourcesPackageVersion>2.2.0-preview1-34967</MicrosoftExtensionsProcessSourcesPackageVersion>
-    <MicrosoftNETCoreApp20PackageVersion>2.0.9</MicrosoftNETCoreApp20PackageVersion>
-    <MicrosoftNETCoreApp21PackageVersion>2.1.2</MicrosoftNETCoreApp21PackageVersion>
-    <MicrosoftNETCoreApp22PackageVersion>2.2.0-preview1-26618-02</MicrosoftNETCoreApp22PackageVersion>
+    <InternalAspNetCoreSdkPackageVersion>3.0.0-alpha1-20180821.3</InternalAspNetCoreSdkPackageVersion>
+    <MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>3.0.0-alpha1-10352</MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>
+    <MicrosoftAspNetCoreTestingPackageVersion>3.0.0-alpha1-10352</MicrosoftAspNetCoreTestingPackageVersion>
+    <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.0.0-alpha1-10352</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
+    <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>3.0.0-alpha1-10352</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
+    <MicrosoftExtensionsProcessSourcesPackageVersion>3.0.0-alpha1-10352</MicrosoftExtensionsProcessSourcesPackageVersion>
+    <MicrosoftNETCoreApp30PackageVersion>3.0.0-preview1-26821-04</MicrosoftNETCoreApp30PackageVersion>
    <MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
    <MicrosoftWebApiClientPackageVersion>5.2.6</MicrosoftWebApiClientPackageVersion>
    <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
-    <SystemDataSqlClientPackageVersion>4.5.1</SystemDataSqlClientPackageVersion>
-    <SystemSecurityCryptographyCngPackageVersion>4.5.0</SystemSecurityCryptographyCngPackageVersion>
+    <SystemDataSqlClientPackageVersion>4.6.0-preview1-26817-04</SystemDataSqlClientPackageVersion>
+    <SystemSecurityCryptographyCngPackageVersion>4.6.0-preview1-26817-04</SystemSecurityCryptographyCngPackageVersion>
    <NewtonsoftJsonPackageVersion>11.0.2</NewtonsoftJsonPackageVersion>
    <VisualStudio_NewtonsoftJsonPackageVersion>9.0.1</VisualStudio_NewtonsoftJsonPackageVersion>
    <XunitPackageVersion>2.3.1</XunitPackageVersion>
--- a/build/repo.props
+++ b/build/repo.props
@ -2,13 +2,12 @@
  <Import Project="dependencies.props" />

  <ItemGroup>
-    <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp22PackageVersion)" />
+    <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp30PackageVersion)" />
  </ItemGroup>

  <PropertyGroup>
    <!-- These properties are use by the automation that updates dependencies.props -->
    <LineupPackageId>Internal.AspNetCore.Universe.Lineup</LineupPackageId>
-    <LineupPackageVersion>2.2.0-*</LineupPackageVersion>
    <LineupPackageRestoreSource>https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json</LineupPackageRestoreSource>
  </PropertyGroup>

--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@ -1,2 +1,2 @@
-version:2.2.0-preview1-20180807.2
-commithash:11495dbd236104434e08cb1152fcb58cf2a20923
+version:3.0.0-alpha1-20180821.3
+commithash:0939a90812deb1c604eb9a4768869687495fc1dd
--- a/korebuild.json
+++ b/korebuild.json
@ -1,6 +1,6 @@
 {
-  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.2/tools/korebuild.schema.json",
-  "channel": "release/2.2",
+  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
+  "channel": "master",
  "toolsets": {
    "visualstudio": {
      "required": [
--- a/run.ps1
+++ b/run.ps1
@ -52,8 +52,8 @@ in the file are overridden by command line parameters.
 Example config file:
 ```json
 {
-  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
-  "channel": "dev",
+  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
+  "channel": "master",
  "toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools"
 }
 ```
@ -192,7 +192,7 @@ if (!$DotNetHome) {
        else { Join-Path $PSScriptRoot '.dotnet'}
 }

-if (!$Channel) { $Channel = 'dev' }
+if (!$Channel) { $Channel = 'master' }
 if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' }

 # Execute
--- a/run.sh
+++ b/run.sh
@ -248,7 +248,7 @@ if [ -f "$config_file" ]; then
    [ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source"
 fi

-[ -z "$channel" ] && channel='dev'
+[ -z "$channel" ] && channel='master'
 [ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools'

 get_korebuild
--- a/samples/dotnet-watch/LaunchAnyCommand/LaunchAnyCommand.csproj
+++ b/samples/dotnet-watch/LaunchAnyCommand/LaunchAnyCommand.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
  </PropertyGroup>

  <ItemGroup>
--- a/samples/dotnet-watch/WatchJavascriptFiles/WatchJavascriptFiles.csproj
+++ b/samples/dotnet-watch/WatchJavascriptFiles/WatchJavascriptFiles.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
  </PropertyGroup>

  <ItemGroup>
--- a/samples/dotnet-watch/WatchMultipleProjects/Test/Test.csproj
+++ b/samples/dotnet-watch/WatchMultipleProjects/Test/Test.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
  </PropertyGroup>

  <ItemGroup>
--- a/samples/dotnet-watch/WatchMultipleProjects/Web/Web.csproj
+++ b/samples/dotnet-watch/WatchMultipleProjects/Web/Web.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
  </PropertyGroup>

  <ItemGroup>
--- a/samples/dotnet-watch/WatchMultipleProjects/watch.csproj
+++ b/samples/dotnet-watch/WatchMultipleProjects/watch.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
    <EnableDefaultItems>false</EnableDefaultItems>
  </PropertyGroup>

--- a/src/Microsoft.AspNetCore.DeveloperCertificates.XPlat/Microsoft.AspNetCore.DeveloperCertificates.XPlat.csproj
+++ b/src/Microsoft.AspNetCore.DeveloperCertificates.XPlat/Microsoft.AspNetCore.DeveloperCertificates.XPlat.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
    <Description>Package for the CLI first run experience.</Description>
    <DefineConstants>$(DefineConstants);XPLAT</DefineConstants>
    <PackageTags>aspnet;cli</PackageTags>
--- a/src/dotnet-dev-certs/dotnet-dev-certs.csproj
+++ b/src/dotnet-dev-certs/dotnet-dev-certs.csproj
@ -3,7 +3,7 @@
  <Sdk Name="Microsoft.DotNet.GlobalTools.Sdk" />

  <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
    <OutputType>exe</OutputType>
    <Description>Command line tool to generate certificates used in ASP.NET Core during development.</Description>
    <RootNamespace>Microsoft.AspNetCore.DeveloperCertificates.Tools</RootNamespace>
--- a/src/dotnet-sql-cache/dotnet-sql-cache.csproj
+++ b/src/dotnet-sql-cache/dotnet-sql-cache.csproj
@ -3,7 +3,7 @@
  <Sdk Name="Microsoft.DotNet.GlobalTools.Sdk" />

  <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
    <OutputType>exe</OutputType>
    <Description>Command line tool to create tables and indexes in a Microsoft SQL Server database for distributed caching.</Description>
    <PackageTags>cache;distributedcache;sqlserver</PackageTags>
@ -28,6 +28,7 @@
    <ExcludePackageFileFromSigning Include="tools/$(TargetFramework)/any/runtimes/win-x64/native/sni.dll" />
    <ExcludePackageFileFromSigning Include="tools/$(TargetFramework)/any/runtimes/win-x86/native/sni.dll" />
    <ExcludePackageFileFromSigning Include="tools/$(TargetFramework)/any/System.Data.SqlClient.dll" />
+    <ExcludePackageFileFromSigning Include="tools/$(TargetFramework)/any/System.Security.Permissions.dll" />
    <ExcludePackageFileFromSigning Include="tools/$(TargetFramework)/any/runtimes/unix/lib/netcoreapp2.1/System.Data.SqlClient.dll" />
    <ExcludePackageFileFromSigning Include="tools/$(TargetFramework)/any/runtimes/win/lib/netcoreapp2.1/System.Data.SqlClient.dll" />
    <ExcludePackageFileFromSigning Include="tools/$(TargetFramework)/any/System.Runtime.CompilerServices.Unsafe.dll" />
--- a/src/dotnet-user-secrets/dotnet-user-secrets.csproj
+++ b/src/dotnet-user-secrets/dotnet-user-secrets.csproj
@ -3,7 +3,7 @@
  <Sdk Name="Microsoft.DotNet.GlobalTools.Sdk" />

  <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
    <OutputType>exe</OutputType>
    <Description>Command line tool to manage user secrets for Microsoft.Extensions.Configuration.</Description>
    <GenerateUserSecretsAttribute>false</GenerateUserSecretsAttribute>
--- a/src/dotnet-watch/dotnet-watch.csproj
+++ b/src/dotnet-watch/dotnet-watch.csproj
@ -3,7 +3,7 @@
  <Sdk Name="Microsoft.DotNet.GlobalTools.Sdk" />

  <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
    <OutputType>exe</OutputType>
    <Description>Command line tool to watch for source file changes during development and restart the dotnet command.</Description>
    <RootNamespace>Microsoft.DotNet.Watcher.Tools</RootNamespace>
--- a/test/dotnet-user-secrets.Tests/UserSecretsTestFixture.cs
+++ b/test/dotnet-user-secrets.Tests/UserSecretsTestFixture.cs
@ -35,7 +35,7 @@ namespace Microsoft.Extensions.Configuration.UserSecrets.Tests
        private const string ProjectTemplate = @"<Project ToolsVersion=""15.0"" Sdk=""Microsoft.NET.Sdk"">
  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.2</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
    {0}
    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
  </PropertyGroup>
--- a/test/dotnet-user-secrets.Tests/dotnet-user-secrets.Tests.csproj
+++ b/test/dotnet-user-secrets.Tests/dotnet-user-secrets.Tests.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
    <AssemblyName>Microsoft.Extensions.SecretManager.Tools.Tests</AssemblyName>
  </PropertyGroup>

--- a/test/dotnet-watch.FunctionalTests/TestProjects/AppWithDeps/AppWithDeps.csproj
+++ b/test/dotnet-watch.FunctionalTests/TestProjects/AppWithDeps/AppWithDeps.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
    <OutputType>exe</OutputType>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

--- a/test/dotnet-watch.FunctionalTests/TestProjects/GlobbingApp/GlobbingApp.csproj
+++ b/test/dotnet-watch.FunctionalTests/TestProjects/GlobbingApp/GlobbingApp.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
    <OutputType>exe</OutputType>
    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
--- a/test/dotnet-watch.FunctionalTests/TestProjects/KitchenSink/KitchenSink.csproj
+++ b/test/dotnet-watch.FunctionalTests/TestProjects/KitchenSink/KitchenSink.csproj
@ -9,7 +9,7 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

    <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
--- a/test/dotnet-watch.FunctionalTests/TestProjects/NoDepsApp/NoDepsApp.csproj
+++ b/test/dotnet-watch.FunctionalTests/TestProjects/NoDepsApp/NoDepsApp.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
    <OutputType>exe</OutputType>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

--- a/test/dotnet-watch.FunctionalTests/dotnet-watch.FunctionalTests.csproj
+++ b/test/dotnet-watch.FunctionalTests/dotnet-watch.FunctionalTests.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
    <DefaultItemExcludes>$(DefaultItemExcludes);TestProjects\**\*</DefaultItemExcludes>
    <AssemblyName>Microsoft.DotNet.Watcher.Tools.FunctionalTests</AssemblyName>
  </PropertyGroup>
--- a/test/dotnet-watch.Tests/ProgramTests.cs
+++ b/test/dotnet-watch.Tests/ProgramTests.cs
@ -28,7 +28,7 @@ namespace Microsoft.DotNet.Watcher.Tools.Tests
        {
            _tempDir
                .WithCSharpProject("testproj")
-                .WithTargetFrameworks("netcoreapp2.2")
+                .WithTargetFrameworks("netcoreapp3.0")
                .Dir()
                .WithFile("Program.cs")
                .Create();
--- a/test/dotnet-watch.Tests/dotnet-watch.Tests.csproj
+++ b/test/dotnet-watch.Tests/dotnet-watch.Tests.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
    <AssemblyName>Microsoft.DotNet.Watcher.Tools.Tests</AssemblyName>
  </PropertyGroup>

--- a/version.props
+++ b/version.props
@ -1,6 +1,6 @@
-<Project>
+<Project>
  <PropertyGroup>
-    <VersionPrefix>2.2.0</VersionPrefix>
+    <VersionPrefix>3.0.0</VersionPrefix>
    <VsixVersion>15.6</VsixVersion>
    <VersionSuffix>preview2</VersionSuffix>
    <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>