From 269d9532aa86a0db57c4bc13a006e1a3de59d460 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 24 Jan 2019 17:17:07 -0800 Subject: [PATCH 01/60] Make Visual Studio 2019 a prerequisite for building this repo --- .azure/pipelines/ci.yml | 10 +++++- .azure/pipelines/jobs/default-build.yml | 5 +-- .azure/pipelines/jobs/iisintegration-job.yml | 3 +- build/tasks/tasks.sln | 6 ++-- docs/BuildFromSource.md | 6 ++-- eng/scripts/InstallVisualStudio.ps1 | 36 +++++++++++-------- eng/tools/tools.sln | 6 ++-- korebuild.json | 2 +- src/Antiforgery/Antiforgery.sln | 6 ++-- src/Azure/Azure.sln | 6 ++-- .../BlazorHosted-CSharp.sln | 6 ++-- src/Components/Components.sln | 2 +- src/DataProtection/DataProtection.sln | 6 ++-- src/DefaultBuilder/DefaultBuilder.sln | 6 ++-- src/Hosting/Hosting.sln | 6 ++-- src/Http/HttpAbstractions.sln | 6 ++-- src/Identity/Identity.sln | 6 ++-- .../IIS-Setup/IIS-Common/Common.sln | 6 ++-- .../IIS-Setup/IIS-Setup.sln | 6 ++-- src/Installers/Windows/Installers.sln | 6 ++-- src/Middleware/Middleware.sln | 2 +- src/MusicStore/MusicStore.sln | 6 ++-- src/Mvc/Mvc.sln | 6 ++-- .../RazorComponentsWeb-CSharp.sln | 6 ++-- src/Razor/Razor.sln | 6 ++-- src/Security/AuthSamples.sln | 6 ++-- src/Security/Security.sln | 2 +- src/Servers/FunctionalTests.sln | 6 ++-- src/Servers/HttpSys/HttpSysServer.sln | 6 ++-- src/Servers/IIS/IISIntegration.NoV1.sln | 6 ++-- src/Servers/IIS/IISIntegration.sln | 6 ++-- src/Servers/Kestrel.sln | 6 ++-- src/SignalR/SignalR.sln | 2 +- src/SignalR/clients/cpp/samples.sln | 4 +-- src/SignalR/clients/cpp/signalrclient.sln | 6 ++-- .../LoggingAggregate/SiteExtensions.sln | 6 ++-- 36 files changed, 119 insertions(+), 105 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index cb73aafae540..ff3144306839 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -8,6 +8,14 @@ pr: - '*' jobs: +- job: Code_check + displayName: Code check + workspace: + clean: all + pool: + name: dotnet-external-temp-vs2019 + steps: + - powershell: ./eng/scripts/CodeCheck.ps1 -ci - template: jobs/default-build.yml parameters: jobName: Windows_Build @@ -45,4 +53,4 @@ jobs: - template: jobs/iisintegration-job.yml parameters: TestGroupName: IISBackCompat - skipArgs: "/p:SkipIISBackwardsCompatibilityTests=false /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISForwardsCompatibilityTests=true" \ No newline at end of file + skipArgs: "/p:SkipIISBackwardsCompatibilityTests=false /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISForwardsCompatibilityTests=true" diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index b32831322751..c5f7ebf0ae31 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -75,6 +75,7 @@ jobs: pool: ${{ if ne(parameters.poolName, '') }}: name: ${{ parameters.poolName }} + ${{ if ne(parameters.poolVmImage, '') }}: vmImage: ${{ parameters.poolVmImage }} ${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'macOS')) }}: name: Hosted macOS @@ -84,9 +85,9 @@ jobs: vmImage: ubuntu-16.04 ${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Windows')) }}: ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: dotnet-internal-temp + name: dotnet-internal-temp-vs2019 ${{ if ne(variables['System.TeamProject'], 'internal') }}: - name: dotnet-external-temp + name: dotnet-external-temp-vs2019 variables: AgentOsName: ${{ parameters.agentOs }} ASPNETCORE_TEST_LOG_MAXPATH: "200" # Keep test log file name length low enough for artifact zipping diff --git a/.azure/pipelines/jobs/iisintegration-job.yml b/.azure/pipelines/jobs/iisintegration-job.yml index d174a9fcc859..f544fd7a117f 100644 --- a/.azure/pipelines/jobs/iisintegration-job.yml +++ b/.azure/pipelines/jobs/iisintegration-job.yml @@ -3,8 +3,7 @@ jobs: parameters: buildScript: ./build.cmd buildArgs: "-ci -restore -build -test -projects src/Servers/IIS/**/*.csproj ${{ parameters.skipArgs }}" - poolName: "Hosted VS2017" - poolVmImage: "vs2017-win2016" + poolName: dotnet-external-temp-vs2019 beforeBuild: - powershell: "& ./src/Servers/IIS/tools/InstallIISFeatures.ps1; & ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1; & ./src/Servers/IIS/tools/SetupTestEnvironment.ps1 Setup" displayName: Prepare repo diff --git a/build/tasks/tasks.sln b/build/tasks/tasks.sln index 917ff4ff83fc..5d8181aa0bf4 100644 --- a/build/tasks/tasks.sln +++ b/build/tasks/tasks.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 -MinimumVisualStudioVersion = 15.0.26124.0 +# Visual Studio 16 +VisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.0.0 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RepoTasks", "RepoTasks.csproj", "{A114791F-35B7-4E5B-8E5B-9A91E0B6E4AE}" EndProject Global diff --git a/docs/BuildFromSource.md b/docs/BuildFromSource.md index 544aea0497ce..0d572a5226ef 100644 --- a/docs/BuildFromSource.md +++ b/docs/BuildFromSource.md @@ -13,10 +13,10 @@ Building ASP.NET Core on Windows requires: * Windows 7 or higher * At least 10 GB of disk space and a good internet connection (our build scripts download a lot of tools and dependencies) -* Visual Studio 2017. - * To install the exact required components, run [eng/scripts/InstallVisualStudio.ps1](/eng/scripts/InstallVisualStudio.ps1). This will use VS2017. +* Visual Studio **2019 Preview**. + * To install the exact required components, run [eng/scripts/InstallVisualStudio.ps1](/eng/scripts/InstallVisualStudio.ps1). ```ps1 - PS> ./eng/scripts/InstallVisualStudio.ps1 -Edition Community + PS> ./eng/scripts/InstallVisualStudio.ps1 ``` * Git. * (Optional) some optional components, like the SignalR Java client, may require diff --git a/eng/scripts/InstallVisualStudio.ps1 b/eng/scripts/InstallVisualStudio.ps1 index 310508f3959f..5d4f1bdd1bbd 100644 --- a/eng/scripts/InstallVisualStudio.ps1 +++ b/eng/scripts/InstallVisualStudio.ps1 @@ -3,14 +3,6 @@ Installs or updates Visual Studio on a local developer machine. .DESCRIPTION This installs Visual Studio along with all the workloads required to contribute to this repository. -.PARAMETER Edition - Must be one of these values: - - Community - Professional - Enterprise - - Selects which 'offering' of Visual Studio to install. .PARAMETER InstallPath The location of Visual Studio @@ -20,18 +12,31 @@ https://visualstudio.com https://github.com/aspnet/AspNetCore/blob/master/docs/BuildFromSource.md .EXAMPLE - To install VS 2017 Community, run + To install VS 2019 Preview, run this command in PowerShell: - InstallVisualStudio.ps1 -Edition Community + .\InstallVisualStudio.ps1 #> [CmdletBinding(DefaultParameterSetName = 'Default')] param( - [ValidateSet('Community', 'Professional', 'Enterprise')] - [string]$Edition, + # TODO - once VS 2019 16.0 RTM is released, make this a parameter again + # .PARAMETER Edition + # Must be one of these values: + + # Community + # Professional + # Enterprise + + # Selects which 'offering' of Visual Studio to install. + + # [ValidateSet('Community', 'Professional', 'Enterprise')] + # [string]$Edition, [string]$InstallPath, [switch]$Passive ) +# VS previews are only available publicly as 'Enterprise' versions. They should be available to the community to use without a paid license. +$Edition = 'Enterprise' + if (-not $Edition) { Write-Host "You must specify a value for the -Edition parameter which selects the kind of Visual Studio to install." -f Red Write-Host "Run ``Get-Help $PSCommandPath`` for more details." -f Red @@ -49,10 +54,11 @@ mkdir $intermedateDir -ErrorAction Ignore | Out-Null $bootstrapper = "$intermedateDir\vsinstaller.exe" $ProgressPreference = 'SilentlyContinue' # Workaround PowerShell/PowerShell#2138 -Invoke-WebRequest -Uri "https://aka.ms/vs/15/release/vs_$($Edition.ToLowerInvariant()).exe" -OutFile $bootstrapper +Invoke-WebRequest -Uri "https://aka.ms/vs/16/pre/vs_$($Edition.ToLowerInvariant()).exe" -OutFile $bootstrapper if (-not $InstallPath) { - $InstallPath = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2017\$Edition" + # $InstallPath = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\$Edition" + $InstallPath = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\Preview" } # no backslashes - this breaks the installer @@ -75,7 +81,7 @@ if ($Passive) { } Write-Host "" -Write-Host "Installing Visual Studio 2017 $Edition" -f Magenta +Write-Host "Installing Visual Studio 2019 $Edition" -f Magenta Write-Host "" Write-Host "Running '$bootstrapper $arguments'" diff --git a/eng/tools/tools.sln b/eng/tools/tools.sln index 527e47cbc3d5..c617ccb79762 100644 --- a/eng/tools/tools.sln +++ b/eng/tools/tools.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 -MinimumVisualStudioVersion = 15.0.26124.0 +# Visual Studio 16 +VisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.0.0 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BaselineGenerator", "BaselineGenerator\BaselineGenerator.csproj", "{CF76A947-3A72-4824-87E6-BF029D84218B}" EndProject Global diff --git a/korebuild.json b/korebuild.json index 035221099480..59dbb94e22b1 100644 --- a/korebuild.json +++ b/korebuild.json @@ -12,7 +12,7 @@ "Windows" ], "includePrerelease": true, - "versionRange": "[15.8, 16.0)", + "versionRange": "[16.0,)", "requiredWorkloads": [ "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", "Microsoft.VisualStudio.Component.VC.ATL", diff --git a/src/Antiforgery/Antiforgery.sln b/src/Antiforgery/Antiforgery.sln index b4e5774f0888..c6ccc8b5144d 100644 --- a/src/Antiforgery/Antiforgery.sln +++ b/src/Antiforgery/Antiforgery.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26208.0 -MinimumVisualStudioVersion = 15.0.26730.03 +# Visual Studio 16 +VisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.0.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{71D070C4-B325-48F7-9F25-DD4E91C2BBCA}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{6EDD8B57-4DE8-4246-A6A3-47ECD92740B4}" diff --git a/src/Azure/Azure.sln b/src/Azure/Azure.sln index f3724c7bc774..f5afc8a87341 100644 --- a/src/Azure/Azure.sln +++ b/src/Azure/Azure.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 -MinimumVisualStudioVersion = 15.0.26124.0 +# Visual Studio 16 +VisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.0.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AzureAD", "AzureAD", "{B931802A-45BB-49A4-9919-B36C827100AC}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Authentication.AzureAD.UI", "Authentication.AzureAD.UI", "{312795E1-D5E2-4021-8FEA-342CA6F14CC8}" diff --git a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.sln b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.sln index 9879df849301..f5b67fc86277 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.sln +++ b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2027 -MinimumVisualStudioVersion = 15.0.26124.0 +# Visual Studio 16 +VisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.0.0 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorHosted-CSharp.Server", "BlazorHosted-CSharp.Server\BlazorHosted-CSharp.Server.csproj", "{650B3CE7-2E93-4CC4-9F46-466686815EAA}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorHosted-CSharp.Client", "BlazorHosted-CSharp.Client\BlazorHosted-CSharp.Client.csproj", "{5990939C-7E7B-4CFA-86FF-44CA5756498A}" diff --git a/src/Components/Components.sln b/src/Components/Components.sln index ee94d6351b7e..ec1639ee4d85 100644 --- a/src/Components/Components.sln +++ b/src/Components/Components.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.28509.92 -MinimumVisualStudioVersion = 15.0.26124.0 +MinimumVisualStudioVersion = 16.0.0.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Analyzers", "Analyzers", "{E059A46B-56E3-41E2-83F4-B5D180056F3B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Analyzers", "Analyzers\src\Microsoft.AspNetCore.Components.Analyzers.csproj", "{ECE91401-329E-4615-8684-8E910D2741C4}" diff --git a/src/DataProtection/DataProtection.sln b/src/DataProtection/DataProtection.sln index c943b8dbc768..73530d8f3a82 100644 --- a/src/DataProtection/DataProtection.sln +++ b/src/DataProtection/DataProtection.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 -MinimumVisualStudioVersion = 15.0.26124.0 +# Visual Studio 16 +VisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.0.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Abstractions", "Abstractions", "{ABD364B3-09A1-4CFE-8D26-FF6417DDEC84}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.DataProtection.Abstractions", "Abstractions\src\Microsoft.AspNetCore.DataProtection.Abstractions.csproj", "{18BE6FD1-1EB1-44AD-A3AE-398C990060F5}" diff --git a/src/DefaultBuilder/DefaultBuilder.sln b/src/DefaultBuilder/DefaultBuilder.sln index 30d776544726..e997573a141b 100644 --- a/src/DefaultBuilder/DefaultBuilder.sln +++ b/src/DefaultBuilder/DefaultBuilder.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 -MinimumVisualStudioVersion = 15.0.26124.0 +# Visual Studio 16 +VisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.0.0 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleApp", "samples\SampleApp\SampleApp.csproj", "{C19108F8-667B-4CF9-B227-CDD2290224BC}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Tests", "test\Microsoft.AspNetCore.Tests\Microsoft.AspNetCore.Tests.csproj", "{1CD49F15-D381-4C7E-8E12-A85E7753B110}" diff --git a/src/Hosting/Hosting.sln b/src/Hosting/Hosting.sln index 0fad5fbf1623..1ceb62073806 100644 --- a/src/Hosting/Hosting.sln +++ b/src/Hosting/Hosting.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27428.2037 -MinimumVisualStudioVersion = 10.0.40219.1 +# Visual Studio 16 +VisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.0.0 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting", "Hosting\src\Microsoft.AspNetCore.Hosting.csproj", "{254295FC-35AF-4A45-A6F4-FF93C1B7CD8D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.Tests", "Hosting\test\Microsoft.AspNetCore.Hosting.Tests.csproj", "{B2A631BD-744E-42FB-BA79-8F22BB27DA65}" diff --git a/src/Http/HttpAbstractions.sln b/src/Http/HttpAbstractions.sln index 3a1bc2056789..eaa003f5127a 100644 --- a/src/Http/HttpAbstractions.sln +++ b/src/Http/HttpAbstractions.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.136 -MinimumVisualStudioVersion = 15.0.26124.0 +# Visual Studio 16 +VisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.0.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Authentication.Abstractions", "Authentication.Abstractions", "{587C3D55-6092-4B86-99F5-E9772C9C1ADB}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Abstractions", "Authentication.Abstractions\src\Microsoft.AspNetCore.Authentication.Abstractions.csproj", "{565B7B00-96A1-49B8-9753-9E045C6527A2}" diff --git a/src/Identity/Identity.sln b/src/Identity/Identity.sln index 6e16865c1516..58143c9d1d0f 100644 --- a/src/Identity/Identity.sln +++ b/src/Identity/Identity.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 -MinimumVisualStudioVersion = 15.0.26124.0 +# Visual Studio 16 +VisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.0.0 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiAuthSample", "ApiAuthorization.IdentityServer\samples\ApiAuthSample\ApiAuthSample.csproj", "{AADD8652-321B-4C7E-B345-C789776667D4}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ApiAuthorization.IdentityServer", "ApiAuthorization.IdentityServer\src\Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj", "{4650E92F-C492-4B44-84FD-83C88972071D}" diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/Common.sln b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/Common.sln index 5b48ec67699c..543516a05b83 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/Common.sln +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/Common.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27120.0 -MinimumVisualStudioVersion = 10.0.40219.1 +# Visual Studio 16 +VisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.0.0 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLib", "lib\CommonLib.vcxproj", "{B54A8F61-60DE-4AD9-87CA-D102F230678E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reftrace", "reftrace\reftrace.vcxproj", "{A2599642-CBE5-4230-8511-3DC2D81874BE}" diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Setup.sln b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Setup.sln index 4ec3c19636cf..22018fe6efb8 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Setup.sln +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Setup.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26730.12 -MinimumVisualStudioVersion = 10.0.40219.1 +# Visual Studio 16 +VisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.0.0 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iisca", "iisca\lib\iisca.vcxproj", "{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLib", "IIS-Common\lib\CommonLib.vcxproj", "{B54A8F61-60DE-4AD9-87CA-D102F230678E}" diff --git a/src/Installers/Windows/Installers.sln b/src/Installers/Windows/Installers.sln index b34c18e8ded3..c1aca9b59646 100644 --- a/src/Installers/Windows/Installers.sln +++ b/src/Installers/Windows/Installers.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 -MinimumVisualStudioVersion = 15.0.26124.0 +# Visual Studio 16 +VisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.0.0 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aspnetcoreCA", "AspNetCoreModule-Setup\CustomAction\aspnetcoreCA.vcxproj", "{7C27E72F-54D0-4820-8CFA-5E4BE640974B}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iisca", "AspNetCoreModule-Setup\IIS-Setup\iisca\lib\iisca.vcxproj", "{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}" diff --git a/src/Middleware/Middleware.sln b/src/Middleware/Middleware.sln index 7b193f652132..ba4c1689905f 100644 --- a/src/Middleware/Middleware.sln +++ b/src/Middleware/Middleware.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.28407.52 -MinimumVisualStudioVersion = 15.0.26124.0 +MinimumVisualStudioVersion = 16.0.0.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebSockets", "WebSockets", "{E0D9867D-C23D-43EB-8D9C-DE0398A25432}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{A86EE055-ACD3-4BAC-A51D-1B3C71067AE0}" diff --git a/src/MusicStore/MusicStore.sln b/src/MusicStore/MusicStore.sln index 5e27218a864f..f1f016e86a58 100644 --- a/src/MusicStore/MusicStore.sln +++ b/src/MusicStore/MusicStore.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26730.12 -MinimumVisualStudioVersion = 15.0.26730.03 +# Visual Studio 16 +VisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.0.0 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MusicStore", "samples\MusicStore\MusicStore.csproj", "{3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MusicStore.Test", "test\MusicStore.Test\MusicStore.Test.csproj", "{CA663205-77DE-4E55-B300-85594181B5A9}" diff --git a/src/Mvc/Mvc.sln b/src/Mvc/Mvc.sln index 82dd2a8cadb7..c8b19a13b446 100644 --- a/src/Mvc/Mvc.sln +++ b/src/Mvc/Mvc.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.136 -MinimumVisualStudioVersion = 10.0.40219.1 +# Visual Studio 16 +VisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.0.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{DAAE4C74-D06F-4874-A166-33305D2643CE}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{32285FA4-6B46-4D6B-A840-2B13E4C8B58E}" diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.sln b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.sln index 7f325cf4fa36..ecd0fcb640c1 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.sln +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2027 -MinimumVisualStudioVersion = 15.0.26124.0 +# Visual Studio 16 +VisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.0.0 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorComponentsWeb-CSharp.Server", "RazorComponentsWeb-CSharp.Server\RazorComponentsWeb-CSharp.Server.csproj", "{650B3CE7-2E93-4CC4-9F46-466686815EAA}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorComponentsWeb-CSharp.App", "RazorComponentsWeb-CSharp.App\RazorComponentsWeb-CSharp.App.csproj", "{5990939C-7E7B-4CFA-86FF-44CA5756498A}" diff --git a/src/Razor/Razor.sln b/src/Razor/Razor.sln index 70997b7b98f4..3b995010c5b5 100644 --- a/src/Razor/Razor.sln +++ b/src/Razor/Razor.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 -MinimumVisualStudioVersion = 15.0.26124.0 +# Visual Studio 16 +VisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.0.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F8C12DD6-659D-405A-AA27-FB22AD92A010}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig diff --git a/src/Security/AuthSamples.sln b/src/Security/AuthSamples.sln index c18f74b920f7..10d4478d0ef1 100644 --- a/src/Security/AuthSamples.sln +++ b/src/Security/AuthSamples.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2003 -MinimumVisualStudioVersion = 10.0.40219.1 +# Visual Studio 16 +VisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.0.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{CA4538F5-9DA8-4139-B891-A13279889F79}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{DA474CFD-7419-4747-A583-CCDC1FF71EB5}" diff --git a/src/Security/Security.sln b/src/Security/Security.sln index b2735e5b235a..cf56b8509166 100644 --- a/src/Security/Security.sln +++ b/src/Security/Security.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.28407.52 -MinimumVisualStudioVersion = 15.0.26730.03 +MinimumVisualStudioVersion = 16.0.0.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Authorization", "Authorization", "{F6A3381D-978A-4CBF-BC72-862FB75CD6AF}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Authentication", "Authentication", "{79C549BA-2932-450A-B87D-635879361343}" diff --git a/src/Servers/FunctionalTests.sln b/src/Servers/FunctionalTests.sln index 82ddc71dc8e1..04b0a2314831 100644 --- a/src/Servers/FunctionalTests.sln +++ b/src/Servers/FunctionalTests.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 -MinimumVisualStudioVersion = 15.0.26124.0 +# Visual Studio 16 +VisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.0.0 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerComparison.FunctionalTests", "test\FunctionalTests\ServerComparison.FunctionalTests.csproj", "{78018310-02F8-4BB8-A8E2-E88AF7A7F51E}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_dependencies", "_dependencies", "{25B4D0F2-96D1-4F34-896E-ABA1E803A230}" diff --git a/src/Servers/HttpSys/HttpSysServer.sln b/src/Servers/HttpSys/HttpSysServer.sln index 00d95c3e60a8..6551a6eb71b5 100644 --- a/src/Servers/HttpSys/HttpSysServer.sln +++ b/src/Servers/HttpSys/HttpSysServer.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26730.10 -MinimumVisualStudioVersion = 15.0.26730.03 +# Visual Studio 16 +VisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.0.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{99D5E5F3-88F5-4CCF-8D8C-717C8925DF09}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{E183C826-1360-4DFF-9994-F33CED5C8525}" diff --git a/src/Servers/IIS/IISIntegration.NoV1.sln b/src/Servers/IIS/IISIntegration.NoV1.sln index 39acf0c5392d..3e0333ea67ec 100644 --- a/src/Servers/IIS/IISIntegration.NoV1.sln +++ b/src/Servers/IIS/IISIntegration.NoV1.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2036 -MinimumVisualStudioVersion = 15.0.26730.03 +# Visual Studio 16 +VisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.0.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0EF45656-B25D-40D8-959C-726EAF185E60}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig diff --git a/src/Servers/IIS/IISIntegration.sln b/src/Servers/IIS/IISIntegration.sln index fdbf12f32045..eac931deb959 100644 --- a/src/Servers/IIS/IISIntegration.sln +++ b/src/Servers/IIS/IISIntegration.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2036 -MinimumVisualStudioVersion = 15.0.26730.03 +# Visual Studio 16 +VisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.0.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0EF45656-B25D-40D8-959C-726EAF185E60}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig diff --git a/src/Servers/Kestrel.sln b/src/Servers/Kestrel.sln index f554a1ccce0a..c736dcc10794 100644 --- a/src/Servers/Kestrel.sln +++ b/src/Servers/Kestrel.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 -MinimumVisualStudioVersion = 15.0.26124.0 +# Visual Studio 16 +VisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.0.0 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Connections.Abstractions", "Connections.Abstractions\src\Microsoft.AspNetCore.Connections.Abstractions.csproj", "{710E0641-FFF4-4994-A7FA-B22A550A8F20}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Core", "Kestrel\Core\src\Microsoft.AspNetCore.Server.Kestrel.Core.csproj", "{5F6D1661-652E-4DF3-8A81-6EBE4208CE1A}" diff --git a/src/SignalR/SignalR.sln b/src/SignalR/SignalR.sln index d237ecd13030..d240cbecd5ba 100644 --- a/src/SignalR/SignalR.sln +++ b/src/SignalR/SignalR.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.28315.86 -MinimumVisualStudioVersion = 15.0.26730.03 +MinimumVisualStudioVersion = 16.0.0.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{C4BC9889-B49F-41B6-806B-F84941B2549B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SignalRSamples", "samples\SignalRSamples\SignalRSamples.csproj", "{C4AEAB04-F341-4539-B6C0-52368FB4BF9E}" diff --git a/src/SignalR/clients/cpp/samples.sln b/src/SignalR/clients/cpp/samples.sln index 2d6131dea754..b152ac18a876 100644 --- a/src/SignalR/clients/cpp/samples.sln +++ b/src/SignalR/clients/cpp/samples.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 -MinimumVisualStudioVersion = 10.0.40219.1 +VisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.0.0 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PersistentConnectionSample", "samples\PersistentConnectionSample\PersistentConnectionSample.vcxproj", "{BD075706-11E9-403B-A2E3-A5E1397E53EF}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HubConnectionSample", "samples\HubConnectionSample\HubConnectionSample.vcxproj", "{3C9BD092-18E6-4C6E-A887-CDFC80ACB206}" diff --git a/src/SignalR/clients/cpp/signalrclient.sln b/src/SignalR/clients/cpp/signalrclient.sln index dad695380903..fbe4c6babaa6 100644 --- a/src/SignalR/clients/cpp/signalrclient.sln +++ b/src/SignalR/clients/cpp/signalrclient.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27428.1 -MinimumVisualStudioVersion = 10.0.40219.1 +# Visual Studio 16 +VisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.0.0 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "signalrclient", "src\signalrclient\Build\VS\signalrclient.vcxproj", "{87ED3AD4-D820-48CD-8382-A12564213A12}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "signalrclienttests", "test\signalrclienttests\Build\VS\signalrclienttests.vcxproj", "{10376148-BCF4-4B55-98A5-3C98C87FD898}" diff --git a/src/SiteExtensions/LoggingAggregate/SiteExtensions.sln b/src/SiteExtensions/LoggingAggregate/SiteExtensions.sln index 9e0983fafd28..a34aa1aaaa27 100644 --- a/src/SiteExtensions/LoggingAggregate/SiteExtensions.sln +++ b/src/SiteExtensions/LoggingAggregate/SiteExtensions.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 -MinimumVisualStudioVersion = 15.0.26124.0 +# Visual Studio 16 +VisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.0.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0ED05384-4F64-44BA-A4AA-47519DA26E8C}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServices.SiteExtension", "src\Microsoft.AspNetCore.AzureAppServices.SiteExtension\Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj", "{69E22952-302D-4C56-B2BE-7C086EB05C79}" From f75253c02a250528b10fe227218082157819e3ec Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 31 Jan 2019 19:25:44 -0800 Subject: [PATCH 02/60] Update .sln files --- build/tasks/tasks.sln | 2 +- eng/tools/tools.sln | 2 +- src/Antiforgery/Antiforgery.sln | 2 +- src/Azure/Azure.sln | 2 +- .../src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.sln | 2 +- src/DataProtection/DataProtection.sln | 2 +- src/DefaultBuilder/DefaultBuilder.sln | 2 +- src/Hosting/Hosting.sln | 2 +- src/Http/HttpAbstractions.sln | 2 +- .../AspNetCoreModule-Setup/IIS-Setup/IIS-Common/Common.sln | 2 +- .../Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Setup.sln | 2 +- src/Installers/Windows/Installers.sln | 2 +- src/MusicStore/MusicStore.sln | 2 +- src/Mvc/Mvc.sln | 2 +- .../RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.sln | 2 +- src/Razor/Razor.sln | 2 +- src/Security/AuthSamples.sln | 2 +- src/Servers/FunctionalTests.sln | 2 +- src/Servers/HttpSys/HttpSysServer.sln | 2 +- src/Servers/IIS/IISIntegration.sln | 2 +- src/Servers/Kestrel.sln | 2 +- src/SignalR/clients/cpp/signalrclient.sln | 2 +- src/SiteExtensions/LoggingAggregate/SiteExtensions.sln | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/build/tasks/tasks.sln b/build/tasks/tasks.sln index 5d8181aa0bf4..55921e71f948 100644 --- a/build/tasks/tasks.sln +++ b/build/tasks/tasks.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 16 +# Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 MinimumVisualStudioVersion = 16.0.0.0 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RepoTasks", "RepoTasks.csproj", "{A114791F-35B7-4E5B-8E5B-9A91E0B6E4AE}" diff --git a/eng/tools/tools.sln b/eng/tools/tools.sln index c617ccb79762..51e337b7e318 100644 --- a/eng/tools/tools.sln +++ b/eng/tools/tools.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 16 +# Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 MinimumVisualStudioVersion = 16.0.0.0 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BaselineGenerator", "BaselineGenerator\BaselineGenerator.csproj", "{CF76A947-3A72-4824-87E6-BF029D84218B}" diff --git a/src/Antiforgery/Antiforgery.sln b/src/Antiforgery/Antiforgery.sln index c6ccc8b5144d..d2b2db4eef13 100644 --- a/src/Antiforgery/Antiforgery.sln +++ b/src/Antiforgery/Antiforgery.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 16 +# Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 MinimumVisualStudioVersion = 16.0.0.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{71D070C4-B325-48F7-9F25-DD4E91C2BBCA}" diff --git a/src/Azure/Azure.sln b/src/Azure/Azure.sln index f5afc8a87341..4000d9554b2b 100644 --- a/src/Azure/Azure.sln +++ b/src/Azure/Azure.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 16 +# Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 MinimumVisualStudioVersion = 16.0.0.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AzureAD", "AzureAD", "{B931802A-45BB-49A4-9919-B36C827100AC}" diff --git a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.sln b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.sln index f5b67fc86277..0d3c4529adc0 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.sln +++ b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 16 +# Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 MinimumVisualStudioVersion = 16.0.0.0 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorHosted-CSharp.Server", "BlazorHosted-CSharp.Server\BlazorHosted-CSharp.Server.csproj", "{650B3CE7-2E93-4CC4-9F46-466686815EAA}" diff --git a/src/DataProtection/DataProtection.sln b/src/DataProtection/DataProtection.sln index 73530d8f3a82..834c97a4fe7c 100644 --- a/src/DataProtection/DataProtection.sln +++ b/src/DataProtection/DataProtection.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 16 +# Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 MinimumVisualStudioVersion = 16.0.0.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Abstractions", "Abstractions", "{ABD364B3-09A1-4CFE-8D26-FF6417DDEC84}" diff --git a/src/DefaultBuilder/DefaultBuilder.sln b/src/DefaultBuilder/DefaultBuilder.sln index 97b8f07007e6..92b547bbedce 100644 --- a/src/DefaultBuilder/DefaultBuilder.sln +++ b/src/DefaultBuilder/DefaultBuilder.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 16 +# Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 MinimumVisualStudioVersion = 16.0.0.0 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleApp", "samples\SampleApp\SampleApp.csproj", "{C19108F8-667B-4CF9-B227-CDD2290224BC}" diff --git a/src/Hosting/Hosting.sln b/src/Hosting/Hosting.sln index 1ceb62073806..fd92557ef639 100644 --- a/src/Hosting/Hosting.sln +++ b/src/Hosting/Hosting.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 16 +# Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 MinimumVisualStudioVersion = 16.0.0.0 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting", "Hosting\src\Microsoft.AspNetCore.Hosting.csproj", "{254295FC-35AF-4A45-A6F4-FF93C1B7CD8D}" diff --git a/src/Http/HttpAbstractions.sln b/src/Http/HttpAbstractions.sln index eaa003f5127a..762c87a0cb82 100644 --- a/src/Http/HttpAbstractions.sln +++ b/src/Http/HttpAbstractions.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 16 +# Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 MinimumVisualStudioVersion = 16.0.0.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Authentication.Abstractions", "Authentication.Abstractions", "{587C3D55-6092-4B86-99F5-E9772C9C1ADB}" diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/Common.sln b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/Common.sln index 543516a05b83..6cda623e6344 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/Common.sln +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/Common.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 16 +# Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 MinimumVisualStudioVersion = 16.0.0.0 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLib", "lib\CommonLib.vcxproj", "{B54A8F61-60DE-4AD9-87CA-D102F230678E}" diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Setup.sln b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Setup.sln index 22018fe6efb8..0b349bffd018 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Setup.sln +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Setup.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 16 +# Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 MinimumVisualStudioVersion = 16.0.0.0 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iisca", "iisca\lib\iisca.vcxproj", "{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}" diff --git a/src/Installers/Windows/Installers.sln b/src/Installers/Windows/Installers.sln index d197f8e5e914..5d55dc1c136b 100644 --- a/src/Installers/Windows/Installers.sln +++ b/src/Installers/Windows/Installers.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 16 +# Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 MinimumVisualStudioVersion = 16.0.0.0 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aspnetcoreCA", "AspNetCoreModule-Setup\CustomAction\aspnetcoreCA.vcxproj", "{7C27E72F-54D0-4820-8CFA-5E4BE640974B}" diff --git a/src/MusicStore/MusicStore.sln b/src/MusicStore/MusicStore.sln index f1f016e86a58..cecb4b2e86f1 100644 --- a/src/MusicStore/MusicStore.sln +++ b/src/MusicStore/MusicStore.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 16 +# Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 MinimumVisualStudioVersion = 16.0.0.0 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MusicStore", "samples\MusicStore\MusicStore.csproj", "{3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}" diff --git a/src/Mvc/Mvc.sln b/src/Mvc/Mvc.sln index 8f2dd208fcc0..83849f104e69 100644 --- a/src/Mvc/Mvc.sln +++ b/src/Mvc/Mvc.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 16 +# Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 MinimumVisualStudioVersion = 16.0.0.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{DAAE4C74-D06F-4874-A166-33305D2643CE}" diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.sln b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.sln index ecd0fcb640c1..39d0af8d654e 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.sln +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 16 +# Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 MinimumVisualStudioVersion = 16.0.0.0 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorComponentsWeb-CSharp.Server", "RazorComponentsWeb-CSharp.Server\RazorComponentsWeb-CSharp.Server.csproj", "{650B3CE7-2E93-4CC4-9F46-466686815EAA}" diff --git a/src/Razor/Razor.sln b/src/Razor/Razor.sln index 3b995010c5b5..351ffa7d14dc 100644 --- a/src/Razor/Razor.sln +++ b/src/Razor/Razor.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 16 +# Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 MinimumVisualStudioVersion = 16.0.0.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F8C12DD6-659D-405A-AA27-FB22AD92A010}" diff --git a/src/Security/AuthSamples.sln b/src/Security/AuthSamples.sln index 10d4478d0ef1..65b6acc184a2 100644 --- a/src/Security/AuthSamples.sln +++ b/src/Security/AuthSamples.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 16 +# Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 MinimumVisualStudioVersion = 16.0.0.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{CA4538F5-9DA8-4139-B891-A13279889F79}" diff --git a/src/Servers/FunctionalTests.sln b/src/Servers/FunctionalTests.sln index 04b0a2314831..4a503e5658cb 100644 --- a/src/Servers/FunctionalTests.sln +++ b/src/Servers/FunctionalTests.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 16 +# Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 MinimumVisualStudioVersion = 16.0.0.0 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerComparison.FunctionalTests", "test\FunctionalTests\ServerComparison.FunctionalTests.csproj", "{78018310-02F8-4BB8-A8E2-E88AF7A7F51E}" diff --git a/src/Servers/HttpSys/HttpSysServer.sln b/src/Servers/HttpSys/HttpSysServer.sln index 6551a6eb71b5..89ec1d421287 100644 --- a/src/Servers/HttpSys/HttpSysServer.sln +++ b/src/Servers/HttpSys/HttpSysServer.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 16 +# Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 MinimumVisualStudioVersion = 16.0.0.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{99D5E5F3-88F5-4CCF-8D8C-717C8925DF09}" diff --git a/src/Servers/IIS/IISIntegration.sln b/src/Servers/IIS/IISIntegration.sln index 3e0333ea67ec..80c0ea5229d5 100644 --- a/src/Servers/IIS/IISIntegration.sln +++ b/src/Servers/IIS/IISIntegration.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 16 +# Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 MinimumVisualStudioVersion = 16.0.0.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0EF45656-B25D-40D8-959C-726EAF185E60}" diff --git a/src/Servers/Kestrel.sln b/src/Servers/Kestrel.sln index c736dcc10794..83cc6c52b913 100644 --- a/src/Servers/Kestrel.sln +++ b/src/Servers/Kestrel.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 16 +# Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 MinimumVisualStudioVersion = 16.0.0.0 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Connections.Abstractions", "Connections.Abstractions\src\Microsoft.AspNetCore.Connections.Abstractions.csproj", "{710E0641-FFF4-4994-A7FA-B22A550A8F20}" diff --git a/src/SignalR/clients/cpp/signalrclient.sln b/src/SignalR/clients/cpp/signalrclient.sln index fbe4c6babaa6..75542200b961 100644 --- a/src/SignalR/clients/cpp/signalrclient.sln +++ b/src/SignalR/clients/cpp/signalrclient.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 16 +# Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 MinimumVisualStudioVersion = 16.0.0.0 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "signalrclient", "src\signalrclient\Build\VS\signalrclient.vcxproj", "{87ED3AD4-D820-48CD-8382-A12564213A12}" diff --git a/src/SiteExtensions/LoggingAggregate/SiteExtensions.sln b/src/SiteExtensions/LoggingAggregate/SiteExtensions.sln index 1ac93cdf4b75..e2d58a7a07f4 100644 --- a/src/SiteExtensions/LoggingAggregate/SiteExtensions.sln +++ b/src/SiteExtensions/LoggingAggregate/SiteExtensions.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 16 +# Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 MinimumVisualStudioVersion = 16.0.0.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0ED05384-4F64-44BA-A4AA-47519DA26E8C}" From 542da21990f3cab731a953a78d83b714c27df60c Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 5 Feb 2019 14:35:22 -0800 Subject: [PATCH 03/60] Update Windows SDK to 17134 --- eng/scripts/vs.json | 9 ++------- .../IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj | 4 ++-- .../IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj | 4 ++-- .../CommonLibTests/CommonLibTests.vcxproj | 4 ++-- src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj | 4 ++-- .../InProcessRequestHandler.vcxproj | 4 ++-- .../OutOfProcessRequestHandler.vcxproj | 4 ++-- .../RequestHandlerLib/RequestHandlerLib.vcxproj | 4 ++-- src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj | 2 +- 9 files changed, 17 insertions(+), 22 deletions(-) diff --git a/eng/scripts/vs.json b/eng/scripts/vs.json index af9903867a99..04259724b2c8 100644 --- a/eng/scripts/vs.json +++ b/eng/scripts/vs.json @@ -1,25 +1,20 @@ { - "channelUri": "https://aka.ms/vs/15/release/channel", - "channelId": "VisualStudio.15.Release", + "channelUri": "https://aka.ms/vs/16/pre/channel", + "channelId": "VisualStudio.16.Preview", "includeRecommended": false, "addProductLang": [ "en-US" ], "add": [ "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", - "Microsoft.VisualStudio.Component.Windows81SDK", "Microsoft.Net.Component.4.7.2.TargetingPack", "Microsoft.Net.Component.4.7.2.SDK", "Microsoft.Net.Component.4.7.1.TargetingPack", "Microsoft.Net.Component.4.7.TargetingPack", "Microsoft.Net.Component.4.6.2.TargetingPack", "Microsoft.Net.Component.4.6.1.TargetingPack", - "Microsoft.Net.Component.4.6.TargetingPack", - "Microsoft.Net.Component.4.5.2.TargetingPack", - "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Win81", "Microsoft.VisualStudio.Component.Azure.Storage.Emulator", "Microsoft.VisualStudio.Component.VC.ATL", - "Microsoft.VisualStudio.Component.Windows10SDK.15063.Desktop", "Microsoft.VisualStudio.Component.Windows10SDK.17134", "Microsoft.VisualStudio.Workload.ManagedDesktop", "Microsoft.VisualStudio.Workload.NetWeb", diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj index b4fbd7ce2739..9cd9c724eaeb 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj @@ -25,7 +25,7 @@ AspNetCore aspnetcorev2 false - 10.0.15063.0 + 10.0.17134.0 @@ -302,4 +302,4 @@ - \ No newline at end of file + diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index 77ad69a3974b..913c11f077f0 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -23,7 +23,7 @@ {55494E58-E061-4C4C-A0A8-837008E72F85} Win32Proj NewCommon - 10.0.15063.0 + 10.0.17134.0 @@ -292,4 +292,4 @@ - \ No newline at end of file + diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj index 5152c2ab11ad..0397c869ce32 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj @@ -20,7 +20,7 @@ {1eac8125-1765-4e2d-8cbe-56dc98a1c8c1} Win32Proj - 10.0.15063.0 + 10.0.17134.0 Application v141 Unicode @@ -194,4 +194,4 @@ - \ No newline at end of file + diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj index 15d4ef1317bf..aba60e9aab9d 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj @@ -23,7 +23,7 @@ Win32Proj IISLib IISLib - 10.0.15063.0 + 10.0.17134.0 @@ -203,4 +203,4 @@ - \ No newline at end of file + diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj index 9785deeab5ce..6eb6cb55baa0 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj @@ -24,7 +24,7 @@ {D57EA297-6DC2-4BC0-8C91-334863327863} Win32Proj InProcessRequestHandler - 10.0.15063.0 + 10.0.17134.0 InProcessRequestHandler @@ -273,4 +273,4 @@ - \ No newline at end of file + diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj index e3d11e040dbd..343171414906 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj @@ -24,7 +24,7 @@ {7F87406C-A3C8-4139-A68D-E4C344294A67} Win32Proj OutOfProcessRequestHandler - 10.0.15063.0 + 10.0.17134.0 OutOfProcessRequestHandler @@ -282,4 +282,4 @@ - \ No newline at end of file + diff --git a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj index 2519c101b1dc..e94c099487c7 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj @@ -23,7 +23,7 @@ {1533E271-F61B-441B-8B74-59FB61DF0552} Win32Proj NewCommon - 10.0.15063.0 + 10.0.17134.0 @@ -217,4 +217,4 @@ - \ No newline at end of file + diff --git a/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj index 62bc98876103..7167a654c54d 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj @@ -27,7 +27,7 @@ {CAC1267B-8778-4257-AAC6-CAF481723B01} Win32Proj gtest - 10.0.15063.0 + 10.0.17134.0 From 24a8712c6b89aa70f3f1da43b404f16fd3e4866f Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 5 Feb 2019 14:36:51 -0800 Subject: [PATCH 04/60] Update docs --- docs/BuildFromSource.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/BuildFromSource.md b/docs/BuildFromSource.md index 1de5d3c2de7a..14116e0189ae 100644 --- a/docs/BuildFromSource.md +++ b/docs/BuildFromSource.md @@ -11,7 +11,7 @@ See https://github.com/aspnet/AspNetCore/labels/area-infrastructure for known is Building ASP.NET Core on Windows requires: -* Windows 7 or higher +* Windows 10 * At least 10 GB of disk space and a good internet connection (our build scripts download a lot of tools and dependencies) * Visual Studio **2019 Preview**. * To install the exact required components, run [eng/scripts/InstallVisualStudio.ps1](/eng/scripts/InstallVisualStudio.ps1). From 6499a53dba3db98f94b3a2d9b50330879ab029b5 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 5 Feb 2019 14:47:16 -0800 Subject: [PATCH 05/60] Disable ANCM tests --- .azure/pipelines/ci.yml | 44 ++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 8adf3145109b..f482fb4c4682 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -330,23 +330,27 @@ jobs: - name: Linux_Test_Logs path: artifacts/logs/ publishOnError: true -- template: jobs/iisintegration-job.yml - parameters: - condition: ne(variables['SkipTests'], 'true') - TestGroupName: IIS - skipArgs: " /p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISTests=false /p:SkipIISExpressTests=true /p:SkipIISForwardsCompatibilityTests=true" -- template: jobs/iisintegration-job.yml - parameters: - condition: ne(variables['SkipTests'], 'true') - TestGroupName: IISExpress - skipArgs: "/p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISTests=true /p:SkipIISExpressTests=false /p:SkipIISForwardsCompatibilityTests=true" -- template: jobs/iisintegration-job.yml - parameters: - condition: ne(variables['SkipTests'], 'true') - TestGroupName: IISForwardCompat - skipArgs: "/p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISForwardsCompatibilityTests=false" -- template: jobs/iisintegration-job.yml - parameters: - condition: ne(variables['SkipTests'], 'true') - TestGroupName: IISBackCompat - skipArgs: "/p:SkipIISBackwardsCompatibilityTests=false /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISForwardsCompatibilityTests=true" + +# Disabled due to unmet machine requirements in the VS2019 machine pool. +# See https://github.com/aspnet/AspNetCore-Internal/issues/1764 +# +# - template: jobs/iisintegration-job.yml +# parameters: +# condition: ne(variables['SkipTests'], 'true') +# TestGroupName: IIS +# skipArgs: " /p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISTests=false /p:SkipIISExpressTests=true /p:SkipIISForwardsCompatibilityTests=true" +# - template: jobs/iisintegration-job.yml +# parameters: +# condition: ne(variables['SkipTests'], 'true') +# TestGroupName: IISExpress +# skipArgs: "/p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISTests=true /p:SkipIISExpressTests=false /p:SkipIISForwardsCompatibilityTests=true" +# - template: jobs/iisintegration-job.yml +# parameters: +# condition: ne(variables['SkipTests'], 'true') +# TestGroupName: IISForwardCompat +# skipArgs: "/p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISForwardsCompatibilityTests=false" +# - template: jobs/iisintegration-job.yml +# parameters: +# condition: ne(variables['SkipTests'], 'true') +# TestGroupName: IISBackCompat +# skipArgs: "/p:SkipIISBackwardsCompatibilityTests=false /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISForwardsCompatibilityTests=true" From 6c052927ceab5b0b3ef859858e9d9a03ff11561d Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 5 Feb 2019 15:51:19 -0800 Subject: [PATCH 06/60] Capture binlog on build --- .azure/pipelines/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index f482fb4c4682..d25784c89dea 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -49,7 +49,7 @@ jobs: # if they have already been signed. This results in slower builds due to re-submitting the same .nupkg many times for signing. # The sign settings have been configured to - - script: ./eng/scripts/cibuild.cmd -arch x64 /p:DisableCodeSigning=true + - script: ./eng/scripts/cibuild.cmd -arch x64 /p:DisableCodeSigning=true /bl:artifacts/logs/build.msbuild.binlog displayName: Build x64 # TODO: make it possible to build for one Windows architecture at a time # This is going to actually build x86 native assets. See https://github.com/aspnet/AspNetCore/issues/7196 From 1a57e2e163076f6cb97c7c440735b8d7f9c0632b Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 6 Feb 2019 08:04:36 -0800 Subject: [PATCH 07/60] Update to .NET Core SDK 3.0 Preview 2 --- Directory.Build.targets | 7 +++++ build/repo.targets | 1 - eng/Version.Details.xml | 4 +++ eng/Versions.props | 28 +++++++++++++++++-- eng/Workarounds.targets | 14 ++++++++++ global.json | 4 +-- korebuild-lock.txt | 4 +-- korebuild.json | 2 +- src/Framework/src/SharedFx.targets | 4 +-- .../src/dotnet-dev-certs.csproj | 2 -- .../src/dotnet-sql-cache.csproj | 2 -- .../src/dotnet-user-secrets.csproj | 2 -- .../dotnet-watch/src/dotnet-watch.csproj | 2 -- 13 files changed, 57 insertions(+), 19 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 1654fd256f7f..d289d9834430 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -12,6 +12,11 @@ $(ArtifactsNonShippingPackagesDir) + + + win-x64;win-x86 + + $(AssemblyName) false @@ -62,6 +67,8 @@ $(MicrosoftNETCoreAppPackageVersion) + + diff --git a/build/repo.targets b/build/repo.targets index b076164fc812..1e69fe6b2124 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -2,7 +2,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c33702611f63..88a484f8422c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -353,6 +353,10 @@ https://github.com/dotnet/corefx 9e074e4a3f3626fa953f36ab79e3cd3e6db1c9de + + https://github.com/dotnet/corefx + 53b8e52dbf12355ce845230f6bbe6c5425bb73e6 + https://github.com/dotnet/core-setup 5ff1240bef06a9a0a6544fcef93808ac26028e43 diff --git a/eng/Versions.props b/eng/Versions.props index ad658179afdf..d20d2de3193a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,7 +6,13 @@ --> - + 3.0.0-preview-27405-2 @@ -34,6 +40,8 @@ 4.6.0-preview.19105.1 4.6.0-preview.19105.1 4.6.0-preview.19105.1 + + 3.0.0-preview.19105.1 3.0.0-preview.19105.4 3.0.0-preview.19105.4 @@ -107,13 +115,27 @@ 3.0.0-preview-19104-04 3.0.0-preview-19104-04 + $(KoreBuildVersion) - 3.0.0-build-20190130.1 + 3.0.0-build-feat-vs2019-20190206.1 1.0.0-alpha-004 15.9.0 - + 4.5.0 diff --git a/eng/Workarounds.targets b/eng/Workarounds.targets index 9b1af1b35fd6..104635f72fbf 100644 --- a/eng/Workarounds.targets +++ b/eng/Workarounds.targets @@ -1,3 +1,17 @@ + + + + + + + + + + $(MicrosoftNETCorePlatformsPackageVersion) + diff --git a/global.json b/global.json index ad876808c107..c2675c6d274e 100644 --- a/global.json +++ b/global.json @@ -1,8 +1,8 @@ { "sdk": { - "version": "3.0.100-preview-009750" + "version": "3.0.100-preview-010184" }, "msbuild-sdks": { - "Internal.AspNetCore.Sdk": "3.0.0-build-20190130.1" + "Internal.AspNetCore.Sdk": "3.0.0-build-feat-vs2019-20190206.1" } } diff --git a/korebuild-lock.txt b/korebuild-lock.txt index c5201be5e49f..f0f5e3a8fc04 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:3.0.0-build-20190130.1 -commithash:3b24877488f6bbff779aa3bd66fcffb4a6c04daf +version:3.0.0-build-feat-vs2019-20190206.1 +commithash:cc6886de9fb992c54e0c859d6347344bd4658423 diff --git a/korebuild.json b/korebuild.json index 59dbb94e22b1..a531d6c7725f 100644 --- a/korebuild.json +++ b/korebuild.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json", - "channel": "master", + "channel": "feature/vs2019", "msbuildType": "full", "toolsets": { "nodejs": { diff --git a/src/Framework/src/SharedFx.targets b/src/Framework/src/SharedFx.targets index 0de8d1dcdb49..d872eaa9a5be 100644 --- a/src/Framework/src/SharedFx.targets +++ b/src/Framework/src/SharedFx.targets @@ -14,10 +14,10 @@ This targets file should only be imported by .shfxproj files. ResolveReferences; GenerateSharedFxVersionsFile; PrepareForPublish; - ComputeAndCopyFilesToPublishDirectory; GeneratePublishDependencyFile; GenerateSharedFxMetadataFiles; - GeneratePublishRuntimeConfigurationFile; + GenerateBuildRuntimeConfigurationFiles; + ComputeAndCopyFilesToPublishDirectory; CopySharedFxToOutput; CollectSharedFxOutput; PostBuildEvent; diff --git a/src/Tools/dotnet-dev-certs/src/dotnet-dev-certs.csproj b/src/Tools/dotnet-dev-certs/src/dotnet-dev-certs.csproj index 17f66f648fbb..2c05d52fcc23 100644 --- a/src/Tools/dotnet-dev-certs/src/dotnet-dev-certs.csproj +++ b/src/Tools/dotnet-dev-certs/src/dotnet-dev-certs.csproj @@ -7,8 +7,6 @@ Microsoft.AspNetCore.DeveloperCertificates.Tools dotnet;developercertificates true - - win-x64;win-x86 false diff --git a/src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj b/src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj index 4cf4de7e735f..4c77514dfcab 100644 --- a/src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj +++ b/src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj @@ -6,8 +6,6 @@ Command line tool to create tables and indexes in a Microsoft SQL Server database for distributed caching. cache;distributedcache;sqlserver true - - win-x64;win-x86 false diff --git a/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj b/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj index f6efc9968c72..3d2957a8d386 100644 --- a/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj +++ b/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj @@ -8,8 +8,6 @@ Microsoft.Extensions.SecretManager.Tools configuration;secrets;usersecrets true - - win-x64;win-x86 false diff --git a/src/Tools/dotnet-watch/src/dotnet-watch.csproj b/src/Tools/dotnet-watch/src/dotnet-watch.csproj index dd95251e1d27..7acb0558385a 100644 --- a/src/Tools/dotnet-watch/src/dotnet-watch.csproj +++ b/src/Tools/dotnet-watch/src/dotnet-watch.csproj @@ -7,8 +7,6 @@ Microsoft.DotNet.Watcher.Tools dotnet;watch true - - win-x64;win-x86 false From 076acbde0c7fc910cf9d54142f3b950c2c0b6505 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 6 Feb 2019 13:08:54 -0800 Subject: [PATCH 08/60] PR feedback --- korebuild.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/korebuild.json b/korebuild.json index a531d6c7725f..93b7433226c4 100644 --- a/korebuild.json +++ b/korebuild.json @@ -12,7 +12,7 @@ "Windows" ], "includePrerelease": true, - "versionRange": "[16.0,)", + "versionRange": "[16.0,17.0)", "requiredWorkloads": [ "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", "Microsoft.VisualStudio.Component.VC.ATL", From eee7ced1f5d034e7c9b9988849c71d163a118bfe Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 7 Feb 2019 11:32:52 -0800 Subject: [PATCH 09/60] Try dotnet-external-temp-staging --- .azure/pipelines/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index d25784c89dea..cd29d1010b2e 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -37,6 +37,8 @@ jobs: jobName: Windows_build jobDisplayName: "Build: Windows x64/x86" agentOs: Windows + # Temporary - try the staging pool + poolName: dotnet-external-temp-staging buildSteps: - script: "echo ##vso[build.addbuildtag]daily-build" condition: and(ne(variables['Build.Reason'], 'PullRequest'), ne(variables['IsFinalBuild'], 'true')) From 4d36be0e8e90e936b36cc7a6f0dc5cb5cab36fff Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 7 Feb 2019 11:38:59 -0800 Subject: [PATCH 10/60] update repo tasks dependencies --- build/tasks/RepoTasks.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/tasks/RepoTasks.csproj b/build/tasks/RepoTasks.csproj index 2069525e614d..6f273643ccac 100644 --- a/build/tasks/RepoTasks.csproj +++ b/build/tasks/RepoTasks.csproj @@ -2,15 +2,15 @@ - netcoreapp2.2 - net461 + netcoreapp3.0 + net472 $(DefineConstants);BUILD_MSI_TASKS true - + From 7edf9b990151cb0695b21e7b1d46770f85faf0fc Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 7 Feb 2019 11:43:10 -0800 Subject: [PATCH 11/60] Update Microsoft.Extensions.DependencyModel --- build/tasks/RepoTasks.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/tasks/RepoTasks.csproj b/build/tasks/RepoTasks.csproj index 6f273643ccac..8c5f2d79f8d4 100644 --- a/build/tasks/RepoTasks.csproj +++ b/build/tasks/RepoTasks.csproj @@ -11,7 +11,7 @@ - + From ad70a546000a03e7ac6bb91dec11717cb2753d3f Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 7 Feb 2019 11:46:10 -0800 Subject: [PATCH 12/60] Add json.net to repo tasks --- build/tasks/RepoTasks.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/build/tasks/RepoTasks.csproj b/build/tasks/RepoTasks.csproj index 8c5f2d79f8d4..cea0fdc541c4 100644 --- a/build/tasks/RepoTasks.csproj +++ b/build/tasks/RepoTasks.csproj @@ -12,6 +12,7 @@ + From 153ce9a91caa2a9d8eb7dabfb5c03db16cc5ee26 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 7 Feb 2019 12:16:58 -0800 Subject: [PATCH 13/60] Revert "Add json.net to repo tasks" This reverts commit ad70a546000a03e7ac6bb91dec11717cb2753d3f. --- build/tasks/RepoTasks.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/build/tasks/RepoTasks.csproj b/build/tasks/RepoTasks.csproj index cea0fdc541c4..8c5f2d79f8d4 100644 --- a/build/tasks/RepoTasks.csproj +++ b/build/tasks/RepoTasks.csproj @@ -12,7 +12,6 @@ - From ae58d6026d48aaed52368019338b5231740e8e07 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 8 Feb 2019 13:43:59 -0800 Subject: [PATCH 14/60] Use Microsoft.NET.Sdk.Razor as a package consistently accross the repo --- eng/Dependencies.props | 1 - eng/targets/CSharp.Common.props | 8 ++++++++ .../Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj | 1 - ...crosoft.AspNetCore.Authentication.AzureADB2C.UI.csproj | 1 - .../samples/AzureADB2CSample/AzureADB2CSample.csproj | 1 - .../testassets/AzureAD.WebSite/AzureAD.WebSite.csproj | 1 - .../HostedInAspNet.Client/HostedInAspNet.Client.csproj | 1 - .../HostedInAspNet.Server/HostedInAspNet.Server.csproj | 1 - .../Microsoft.AspNetCore.Blazor.E2EPerformance.csproj | 1 - .../testassets/MonoSanityClient/MonoSanityClient.csproj | 1 - .../Blazor/testassets/StandaloneApp/StandaloneApp.csproj | 1 - .../test/testassets/BasicTestApp/BasicTestApp.csproj | 1 - .../testassets/ComponentsApp.App/ComponentsApp.App.csproj | 1 - .../ComponentsApp.Server/ComponentsApp.Server.csproj | 1 - .../TestContentPackage/TestContentPackage.csproj | 1 - .../test/testassets/TestServer/TestServer.csproj | 1 - .../samples/ApiAuthSample/ApiAuthSample.csproj | 1 - .../UI/src/Microsoft.AspNetCore.Identity.UI.csproj | 1 - .../Identity.DefaultUI.WebSite.csproj | 1 - src/Middleware/SpaServices/samples/Webpack/Webpack.csproj | 1 - src/MusicStore/samples/MusicStore/MusicStore.csproj | 1 - src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj | 2 -- .../benchmarkapps/RazorRendering/RazorRendering.csproj | 2 -- .../Microsoft.AspNetCore.Mvc.Performance.Views.csproj | 1 - src/Mvc/samples/MvcSandbox/MvcSandbox.csproj | 1 - .../ApplicationModelWebSite.csproj | 1 - src/Mvc/test/WebSites/BasicWebSite/BasicWebSite.csproj | 1 - .../ControllersFromServicesWebSite.csproj | 1 - .../WebSites/GenericHostWebSite/GenericHostWebSite.csproj | 1 - .../HtmlGenerationWebSite/HtmlGenerationWebSite.csproj | 1 - .../WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj | 1 - .../RazorPagesClassLibrary/RazorPagesClassLibrary.csproj | 1 - .../WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj | 1 - src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj | 1 - .../test/WebSites/RoutingWebSite/RoutingWebSite.csproj | 1 - .../test/WebSites/SecurityWebSite/SecurityWebSite.csproj | 1 - .../WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj | 1 - .../ClaimsTransformation/ClaimsTransformation.csproj | 1 - src/Security/samples/Cookies/Cookies.csproj | 1 - .../CustomPolicyProvider/CustomPolicyProvider.csproj | 1 - src/Security/samples/DynamicSchemes/DynamicSchemes.csproj | 1 - .../Identity.ExternalClaims.csproj | 1 - .../PathSchemeSelection/PathSchemeSelection.csproj | 1 - .../samples/StaticFilesAuth/StaticFilesAuth.csproj | 1 - 44 files changed, 8 insertions(+), 45 deletions(-) diff --git a/eng/Dependencies.props b/eng/Dependencies.props index 88323dff63f9..35fb3a202e49 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -112,7 +112,6 @@ and are generated based on the last package release. - diff --git a/eng/targets/CSharp.Common.props b/eng/targets/CSharp.Common.props index b8849afad77f..53e12c2c25c7 100644 --- a/eng/targets/CSharp.Common.props +++ b/eng/targets/CSharp.Common.props @@ -8,6 +8,14 @@ + + + + + diff --git a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj index 1605940b286c..6b1f773de396 100644 --- a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj +++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj @@ -19,7 +19,6 @@ - diff --git a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj index 485d3a40851d..419ae601147e 100644 --- a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj +++ b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj @@ -19,7 +19,6 @@ - diff --git a/src/Azure/AzureAD/samples/AzureADB2CSample/AzureADB2CSample.csproj b/src/Azure/AzureAD/samples/AzureADB2CSample/AzureADB2CSample.csproj index 6b9a99731fb1..a7fccbdd3e26 100644 --- a/src/Azure/AzureAD/samples/AzureADB2CSample/AzureADB2CSample.csproj +++ b/src/Azure/AzureAD/samples/AzureADB2CSample/AzureADB2CSample.csproj @@ -17,7 +17,6 @@ - diff --git a/src/Azure/AzureAD/test/testassets/AzureAD.WebSite/AzureAD.WebSite.csproj b/src/Azure/AzureAD/test/testassets/AzureAD.WebSite/AzureAD.WebSite.csproj index 25e2626cfe21..6507faaaa9b0 100644 --- a/src/Azure/AzureAD/test/testassets/AzureAD.WebSite/AzureAD.WebSite.csproj +++ b/src/Azure/AzureAD/test/testassets/AzureAD.WebSite/AzureAD.WebSite.csproj @@ -11,7 +11,6 @@ - diff --git a/src/Components/Blazor/testassets/HostedInAspNet.Client/HostedInAspNet.Client.csproj b/src/Components/Blazor/testassets/HostedInAspNet.Client/HostedInAspNet.Client.csproj index adab74454e12..2b08bef06084 100644 --- a/src/Components/Blazor/testassets/HostedInAspNet.Client/HostedInAspNet.Client.csproj +++ b/src/Components/Blazor/testassets/HostedInAspNet.Client/HostedInAspNet.Client.csproj @@ -8,7 +8,6 @@ - diff --git a/src/Components/Blazor/testassets/HostedInAspNet.Server/HostedInAspNet.Server.csproj b/src/Components/Blazor/testassets/HostedInAspNet.Server/HostedInAspNet.Server.csproj index dc93f7a937a4..fcd9502fc4f5 100644 --- a/src/Components/Blazor/testassets/HostedInAspNet.Server/HostedInAspNet.Server.csproj +++ b/src/Components/Blazor/testassets/HostedInAspNet.Server/HostedInAspNet.Server.csproj @@ -14,7 +14,6 @@ - diff --git a/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Microsoft.AspNetCore.Blazor.E2EPerformance.csproj b/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Microsoft.AspNetCore.Blazor.E2EPerformance.csproj index 6c60c1580f2b..a488d15a5791 100644 --- a/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Microsoft.AspNetCore.Blazor.E2EPerformance.csproj +++ b/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Microsoft.AspNetCore.Blazor.E2EPerformance.csproj @@ -7,6 +7,5 @@ - diff --git a/src/Components/Blazor/testassets/MonoSanityClient/MonoSanityClient.csproj b/src/Components/Blazor/testassets/MonoSanityClient/MonoSanityClient.csproj index 1dc35e0ca4b7..b1b28785f928 100644 --- a/src/Components/Blazor/testassets/MonoSanityClient/MonoSanityClient.csproj +++ b/src/Components/Blazor/testassets/MonoSanityClient/MonoSanityClient.csproj @@ -12,6 +12,5 @@ - diff --git a/src/Components/Blazor/testassets/StandaloneApp/StandaloneApp.csproj b/src/Components/Blazor/testassets/StandaloneApp/StandaloneApp.csproj index 6c60c1580f2b..a488d15a5791 100644 --- a/src/Components/Blazor/testassets/StandaloneApp/StandaloneApp.csproj +++ b/src/Components/Blazor/testassets/StandaloneApp/StandaloneApp.csproj @@ -7,6 +7,5 @@ - diff --git a/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj b/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj index 7524ef0c1889..56ae26e35d2a 100644 --- a/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj +++ b/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj @@ -10,7 +10,6 @@ - diff --git a/src/Components/test/testassets/ComponentsApp.App/ComponentsApp.App.csproj b/src/Components/test/testassets/ComponentsApp.App/ComponentsApp.App.csproj index e845bc60d499..317f4b715afd 100644 --- a/src/Components/test/testassets/ComponentsApp.App/ComponentsApp.App.csproj +++ b/src/Components/test/testassets/ComponentsApp.App/ComponentsApp.App.csproj @@ -10,7 +10,6 @@ - diff --git a/src/Components/test/testassets/ComponentsApp.Server/ComponentsApp.Server.csproj b/src/Components/test/testassets/ComponentsApp.Server/ComponentsApp.Server.csproj index 14ff94d22612..be50b6a49919 100644 --- a/src/Components/test/testassets/ComponentsApp.Server/ComponentsApp.Server.csproj +++ b/src/Components/test/testassets/ComponentsApp.Server/ComponentsApp.Server.csproj @@ -6,7 +6,6 @@ - diff --git a/src/Components/test/testassets/TestContentPackage/TestContentPackage.csproj b/src/Components/test/testassets/TestContentPackage/TestContentPackage.csproj index f61c27f865eb..2048580e176e 100644 --- a/src/Components/test/testassets/TestContentPackage/TestContentPackage.csproj +++ b/src/Components/test/testassets/TestContentPackage/TestContentPackage.csproj @@ -21,7 +21,6 @@ - diff --git a/src/Components/test/testassets/TestServer/TestServer.csproj b/src/Components/test/testassets/TestServer/TestServer.csproj index d8d70bdf7645..a56f986a37be 100644 --- a/src/Components/test/testassets/TestServer/TestServer.csproj +++ b/src/Components/test/testassets/TestServer/TestServer.csproj @@ -10,7 +10,6 @@ - diff --git a/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/ApiAuthSample.csproj b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/ApiAuthSample.csproj index 21493eae44d6..df96819c67c0 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/ApiAuthSample.csproj +++ b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/ApiAuthSample.csproj @@ -30,7 +30,6 @@ - diff --git a/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj b/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj index 24064cf10a3b..361bbfc5c6e2 100644 --- a/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj +++ b/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj @@ -35,7 +35,6 @@ - diff --git a/src/Identity/testassets/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj b/src/Identity/testassets/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj index 45574a14ac1f..e2ec0518f387 100644 --- a/src/Identity/testassets/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj +++ b/src/Identity/testassets/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj @@ -39,7 +39,6 @@ - diff --git a/src/Middleware/SpaServices/samples/Webpack/Webpack.csproj b/src/Middleware/SpaServices/samples/Webpack/Webpack.csproj index cd46134c008d..494b84a78017 100644 --- a/src/Middleware/SpaServices/samples/Webpack/Webpack.csproj +++ b/src/Middleware/SpaServices/samples/Webpack/Webpack.csproj @@ -16,7 +16,6 @@ - diff --git a/src/MusicStore/samples/MusicStore/MusicStore.csproj b/src/MusicStore/samples/MusicStore/MusicStore.csproj index f720307d0528..d38938bba1e4 100644 --- a/src/MusicStore/samples/MusicStore/MusicStore.csproj +++ b/src/MusicStore/samples/MusicStore/MusicStore.csproj @@ -33,7 +33,6 @@ - diff --git a/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj b/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj index ef8b17d1e20d..c3ac81d3d541 100644 --- a/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj +++ b/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj @@ -28,7 +28,6 @@ - @@ -42,6 +41,5 @@ DefaultRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)" LatestRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)" TargetingPackVersion="$(MicrosoftAspNetCoreAppPackageVersion)" /> - diff --git a/src/Mvc/benchmarkapps/RazorRendering/RazorRendering.csproj b/src/Mvc/benchmarkapps/RazorRendering/RazorRendering.csproj index c6c4324285ee..436e060a6e5c 100644 --- a/src/Mvc/benchmarkapps/RazorRendering/RazorRendering.csproj +++ b/src/Mvc/benchmarkapps/RazorRendering/RazorRendering.csproj @@ -9,7 +9,6 @@ - @@ -23,7 +22,6 @@ DefaultRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)" LatestRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)" TargetingPackVersion="$(MicrosoftAspNetCoreAppPackageVersion)" /> - diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Microsoft.AspNetCore.Mvc.Performance.Views.csproj b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Microsoft.AspNetCore.Mvc.Performance.Views.csproj index 22a5b9d99b7f..ca14afc0b5be 100644 --- a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Microsoft.AspNetCore.Mvc.Performance.Views.csproj +++ b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Microsoft.AspNetCore.Mvc.Performance.Views.csproj @@ -9,7 +9,6 @@ - diff --git a/src/Mvc/samples/MvcSandbox/MvcSandbox.csproj b/src/Mvc/samples/MvcSandbox/MvcSandbox.csproj index 9d3ee6d84468..510f26e32ee4 100644 --- a/src/Mvc/samples/MvcSandbox/MvcSandbox.csproj +++ b/src/Mvc/samples/MvcSandbox/MvcSandbox.csproj @@ -15,7 +15,6 @@ - diff --git a/src/Mvc/test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.csproj b/src/Mvc/test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.csproj index 2f86cf71b880..63b09ef8fa5f 100644 --- a/src/Mvc/test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.csproj +++ b/src/Mvc/test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.csproj @@ -11,6 +11,5 @@ - diff --git a/src/Mvc/test/WebSites/BasicWebSite/BasicWebSite.csproj b/src/Mvc/test/WebSites/BasicWebSite/BasicWebSite.csproj index d452f269a8f7..97ef847b07ff 100644 --- a/src/Mvc/test/WebSites/BasicWebSite/BasicWebSite.csproj +++ b/src/Mvc/test/WebSites/BasicWebSite/BasicWebSite.csproj @@ -22,6 +22,5 @@ - diff --git a/src/Mvc/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.csproj b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.csproj index d0ab53471341..e409e9764b6b 100644 --- a/src/Mvc/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.csproj +++ b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.csproj @@ -14,6 +14,5 @@ - diff --git a/src/Mvc/test/WebSites/GenericHostWebSite/GenericHostWebSite.csproj b/src/Mvc/test/WebSites/GenericHostWebSite/GenericHostWebSite.csproj index e4c1a38652d4..6f600027f6c7 100644 --- a/src/Mvc/test/WebSites/GenericHostWebSite/GenericHostWebSite.csproj +++ b/src/Mvc/test/WebSites/GenericHostWebSite/GenericHostWebSite.csproj @@ -22,6 +22,5 @@ - diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj b/src/Mvc/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj index 97ceb074deca..e10c2e168b9c 100644 --- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj +++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj @@ -12,6 +12,5 @@ - diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj b/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj index 76177e178953..77bed0b15f1a 100644 --- a/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj +++ b/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj @@ -20,7 +20,6 @@ - diff --git a/src/Mvc/test/WebSites/RazorPagesClassLibrary/RazorPagesClassLibrary.csproj b/src/Mvc/test/WebSites/RazorPagesClassLibrary/RazorPagesClassLibrary.csproj index 62fe5f58b231..110ba0c8cce6 100644 --- a/src/Mvc/test/WebSites/RazorPagesClassLibrary/RazorPagesClassLibrary.csproj +++ b/src/Mvc/test/WebSites/RazorPagesClassLibrary/RazorPagesClassLibrary.csproj @@ -11,7 +11,6 @@ - diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj b/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj index 5e4df59fccab..a7ccaf6ebff1 100644 --- a/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj +++ b/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj @@ -15,6 +15,5 @@ - diff --git a/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj b/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj index edf7a035d9f6..f6b24e30ec33 100644 --- a/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj +++ b/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj @@ -15,6 +15,5 @@ - diff --git a/src/Mvc/test/WebSites/RoutingWebSite/RoutingWebSite.csproj b/src/Mvc/test/WebSites/RoutingWebSite/RoutingWebSite.csproj index 68730eaad340..145510e30e1e 100644 --- a/src/Mvc/test/WebSites/RoutingWebSite/RoutingWebSite.csproj +++ b/src/Mvc/test/WebSites/RoutingWebSite/RoutingWebSite.csproj @@ -16,6 +16,5 @@ - diff --git a/src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj b/src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj index b750961151ff..67d19453c6f1 100644 --- a/src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj +++ b/src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj @@ -12,6 +12,5 @@ - diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj index 13b3843f6c6a..4717009c541d 100644 --- a/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj +++ b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj @@ -12,6 +12,5 @@ - diff --git a/src/Security/samples/ClaimsTransformation/ClaimsTransformation.csproj b/src/Security/samples/ClaimsTransformation/ClaimsTransformation.csproj index 91734de30575..356b19430d3b 100644 --- a/src/Security/samples/ClaimsTransformation/ClaimsTransformation.csproj +++ b/src/Security/samples/ClaimsTransformation/ClaimsTransformation.csproj @@ -10,7 +10,6 @@ - diff --git a/src/Security/samples/Cookies/Cookies.csproj b/src/Security/samples/Cookies/Cookies.csproj index 91734de30575..356b19430d3b 100644 --- a/src/Security/samples/Cookies/Cookies.csproj +++ b/src/Security/samples/Cookies/Cookies.csproj @@ -10,7 +10,6 @@ - diff --git a/src/Security/samples/CustomPolicyProvider/CustomPolicyProvider.csproj b/src/Security/samples/CustomPolicyProvider/CustomPolicyProvider.csproj index 70e4609aae1c..f0608927d255 100644 --- a/src/Security/samples/CustomPolicyProvider/CustomPolicyProvider.csproj +++ b/src/Security/samples/CustomPolicyProvider/CustomPolicyProvider.csproj @@ -10,6 +10,5 @@ - diff --git a/src/Security/samples/DynamicSchemes/DynamicSchemes.csproj b/src/Security/samples/DynamicSchemes/DynamicSchemes.csproj index 2c65adebbad4..d72d8146710c 100644 --- a/src/Security/samples/DynamicSchemes/DynamicSchemes.csproj +++ b/src/Security/samples/DynamicSchemes/DynamicSchemes.csproj @@ -21,6 +21,5 @@ - diff --git a/src/Security/samples/Identity.ExternalClaims/Identity.ExternalClaims.csproj b/src/Security/samples/Identity.ExternalClaims/Identity.ExternalClaims.csproj index cf7f7ee9b79b..fc5f7fded59c 100644 --- a/src/Security/samples/Identity.ExternalClaims/Identity.ExternalClaims.csproj +++ b/src/Security/samples/Identity.ExternalClaims/Identity.ExternalClaims.csproj @@ -26,6 +26,5 @@ - diff --git a/src/Security/samples/PathSchemeSelection/PathSchemeSelection.csproj b/src/Security/samples/PathSchemeSelection/PathSchemeSelection.csproj index 91734de30575..356b19430d3b 100644 --- a/src/Security/samples/PathSchemeSelection/PathSchemeSelection.csproj +++ b/src/Security/samples/PathSchemeSelection/PathSchemeSelection.csproj @@ -10,7 +10,6 @@ - diff --git a/src/Security/samples/StaticFilesAuth/StaticFilesAuth.csproj b/src/Security/samples/StaticFilesAuth/StaticFilesAuth.csproj index b9b72ef3a678..5061fcb02287 100644 --- a/src/Security/samples/StaticFilesAuth/StaticFilesAuth.csproj +++ b/src/Security/samples/StaticFilesAuth/StaticFilesAuth.csproj @@ -38,7 +38,6 @@ - From 9c36819b0bf6325ce7ad0a533c33888295f129e7 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 8 Feb 2019 13:56:54 -0800 Subject: [PATCH 15/60] Move helix targets --- Directory.Build.targets | 92 +------------------------------ eng/Versions.props | 1 + eng/helix/HelixProject.targets | 96 +++++++++++++++++++++++++++++++++ eng/targets/CSharp.Common.props | 4 ++ 4 files changed, 102 insertions(+), 91 deletions(-) create mode 100644 eng/helix/HelixProject.targets diff --git a/Directory.Build.targets b/Directory.Build.targets index c45b96e3e884..07bd2fe930e1 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -80,96 +80,6 @@ + - - - - - - - - - <_TargetFrameworks Remove="@(_TargetFrameworks)" /> - <_TargetFrameworks Include="$(TargetFrameworks);$(TargetFramework)" /> - - - - - - - - - - - - - - - - - - <_TargetFrameworks Remove="@(_TargetFrameworks)" /> - <_TargetFrameworks Include="$(TargetFrameworks);$(TargetFramework)" /> - - - - - - - - - - $([System.IO.Path]::GetDirectoryName($(XunitConsole472Path))) - - - - - - - - - - - - - - - - - - <_CopyItems Include="$(MSBuildThisFileDirectory)eng\helix\vstest\runtests.cmd" /> - - - - - <_CopyItems Include="$(MSBuildThisFileDirectory)eng\helix\xunit\runtests.cmd" /> - - - - - <_CopyItems Include="$(MSBuildThisFileDirectory)eng\helix\vstest\runtests.sh" /> - - - - - - - $(TargetFileName) - $(MSBuildProjectName)-$(TargetFramework) - runtests.cmd $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppPackageVersion) - ./runtests.sh $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppPackageVersion) - 00:30:00 - - - diff --git a/eng/Versions.props b/eng/Versions.props index b8e176b02689..00e7b18b1a8b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -198,5 +198,6 @@ 2.3.1 2.4.0 2.4.0 + 2.4.1 diff --git a/eng/helix/HelixProject.targets b/eng/helix/HelixProject.targets new file mode 100644 index 000000000000..5efbfb5b7080 --- /dev/null +++ b/eng/helix/HelixProject.targets @@ -0,0 +1,96 @@ + + + + + + + <_TargetFrameworks Remove="@(_TargetFrameworks)" /> + <_TargetFrameworks Include="$(TargetFrameworks);$(TargetFramework)" /> + + + + + + + + + + + + + + + + + + <_TargetFrameworks Remove="@(_TargetFrameworks)" /> + <_TargetFrameworks Include="$(TargetFrameworks);$(TargetFramework)" /> + + + + + + + + + + $([System.IO.Path]::GetDirectoryName($(XunitConsole472Path))) + + + + + + + + + + + + + + + + + + <_CopyItems Include="$(MSBuildThisFileDirectory)vstest\runtests.cmd" /> + + + + + <_CopyItems Include="$(MSBuildThisFileDirectory)xunit\runtests.cmd" /> + + + + + <_CopyItems Include="$(MSBuildThisFileDirectory)vstest\runtests.sh" /> + + + + + + + $(TargetFileName) + $(MSBuildProjectName)-$(TargetFramework) + runtests.cmd $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppPackageVersion) + ./runtests.sh $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppPackageVersion) + 00:30:00 + + + + + \ No newline at end of file diff --git a/eng/targets/CSharp.Common.props b/eng/targets/CSharp.Common.props index 53e12c2c25c7..14e9a06f07c8 100644 --- a/eng/targets/CSharp.Common.props +++ b/eng/targets/CSharp.Common.props @@ -16,6 +16,10 @@ + + + + From ffa977ffb977f3f5a27b7015901198b2b562034d Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 8 Feb 2019 13:58:55 -0800 Subject: [PATCH 16/60] React to changes in metadata from Microsoft.NETCore.App --- src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj index cc20b131659d..524030fbdfa7 100644 --- a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj +++ b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj @@ -72,7 +72,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant + Exclude=" + @(ReferencePathWithRefAssemblies->WithMetadataValue('NuGetPackageId', 'Microsoft.NETCore.App')); + @(ReferencePathWithRefAssemblies->WithMetadataValue('ReferenceGrouping', 'Microsoft.NETCore.App'));" /> From 9d25b47511aa009624d5d2728d7b8aa4f5d48d92 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 8 Feb 2019 14:52:25 -0800 Subject: [PATCH 17/60] React to changes in .NET Core SDK --- Directory.Build.targets | 14 ++++++++++++++ src/Framework/pkg/Metapackage.targets | 8 -------- .../src/Microsoft.AspNetCore.App.shfxproj | 5 +---- src/Framework/src/SharedFx.targets | 12 +++--------- .../Sdk/HostingStartup/HostingStartup.csproj | 2 +- src/SiteExtensions/Sdk/SiteExtension.targets | 2 +- 6 files changed, 20 insertions(+), 23 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 07bd2fe930e1..8c53c2908c71 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -72,6 +72,20 @@ true + + + $(MicrosoftNETCoreAppPackageVersion) + $(MicrosoftNETCoreAppPackageVersion) + $(MicrosoftNETCoreAppPackageVersion) + + + + $(SharedFxVersion) + $(SharedFxVersion) + $(SharedFxVersion) + + + diff --git a/src/Framework/pkg/Metapackage.targets b/src/Framework/pkg/Metapackage.targets index 1e43373b9b28..8fb53cad5237 100644 --- a/src/Framework/pkg/Metapackage.targets +++ b/src/Framework/pkg/Metapackage.targets @@ -6,8 +6,6 @@ false false - - true true @@ -24,12 +22,6 @@ - - $(MicrosoftNETCoreAppPackageVersion) - All - true - - diff --git a/src/Framework/src/Microsoft.AspNetCore.App.shfxproj b/src/Framework/src/Microsoft.AspNetCore.App.shfxproj index 02988ace392f..d72bfd14ccd4 100644 --- a/src/Framework/src/Microsoft.AspNetCore.App.shfxproj +++ b/src/Framework/src/Microsoft.AspNetCore.App.shfxproj @@ -10,10 +10,7 @@ $(TargetRuntimeIdentifier) $(DefaultNetCoreTargetFramework) Microsoft.NETCore.App - $(MicrosoftNETCoreAppPackageVersion) - - - true + true true diff --git a/src/Framework/src/SharedFx.targets b/src/Framework/src/SharedFx.targets index 05ec4c18fdec..7db7ca444edc 100644 --- a/src/Framework/src/SharedFx.targets +++ b/src/Framework/src/SharedFx.targets @@ -13,6 +13,7 @@ This targets file should only be imported by .shfxproj files. PreBuildEvent; ResolveReferences; GenerateSharedFxVersionsFile; + GenerateBuildDependencyFile; PrepareForPublish; GeneratePublishDependencyFile; GenerateSharedFxMetadataFiles; @@ -92,8 +93,8 @@ This targets file should only be imported by .shfxproj files. $(IntermediateOutputPath)$(SharedFxName).runtimeconfig.dev.json - $(IntermediateOutputPath)$(SharedFxName).project.deps.json - $(IntermediateOutputPath)$(SharedFxName).publish.deps.json + $(IntermediateOutputPath)$(SharedFxName).intermediate.deps.json + $(ProjectDepsFilePath) $(MetadataOutputPath)$(SharedFxName).runtimeconfig.json @@ -132,13 +133,6 @@ This targets file should only be imported by .shfxproj files. - - true - All - Native - true - - Runtime;Native diff --git a/src/SiteExtensions/Sdk/HostingStartup/HostingStartup.csproj b/src/SiteExtensions/Sdk/HostingStartup/HostingStartup.csproj index 6faa3b0919a9..9628c2f525e7 100644 --- a/src/SiteExtensions/Sdk/HostingStartup/HostingStartup.csproj +++ b/src/SiteExtensions/Sdk/HostingStartup/HostingStartup.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/SiteExtensions/Sdk/SiteExtension.targets b/src/SiteExtensions/Sdk/SiteExtension.targets index beed2c8708f3..ca98b5308523 100644 --- a/src/SiteExtensions/Sdk/SiteExtension.targets +++ b/src/SiteExtensions/Sdk/SiteExtension.targets @@ -27,7 +27,7 @@ - + From 42ff3194da010dcfb576c2f4a5b1cd72d43f6cb2 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 8 Feb 2019 15:02:54 -0800 Subject: [PATCH 18/60] Revert updates to repotask dependencies --- build/tasks/RepoTasks.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/tasks/RepoTasks.csproj b/build/tasks/RepoTasks.csproj index 8c5f2d79f8d4..ccd8d61b03a3 100644 --- a/build/tasks/RepoTasks.csproj +++ b/build/tasks/RepoTasks.csproj @@ -10,8 +10,8 @@ - - + + From d34721dac78869e881297af87afa704502345a08 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 8 Feb 2019 15:23:05 -0800 Subject: [PATCH 19/60] Update dependencies --- eng/Version.Details.xml | 100 ++++++++++++++++++++-------------------- eng/Versions.props | 50 ++++++++++---------- 2 files changed, 75 insertions(+), 75 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c61af046747..8a03caaf724c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,105 +277,105 @@ https://github.com/aspnet/Extensions f3e1ef8da55fc9336fc2a050afd614530bd0264e - + https://github.com/dotnet/corefx - c38c10d28e223aeea2f363a6ef0bf4a63d00a776 + c2bbb6a5ee5ff67e5e8353e154d7b4c4f2f83143 - + https://github.com/dotnet/corefx - c38c10d28e223aeea2f363a6ef0bf4a63d00a776 + c2bbb6a5ee5ff67e5e8353e154d7b4c4f2f83143 - + https://github.com/dotnet/corefx - c38c10d28e223aeea2f363a6ef0bf4a63d00a776 + c2bbb6a5ee5ff67e5e8353e154d7b4c4f2f83143 - + https://github.com/dotnet/corefx - c38c10d28e223aeea2f363a6ef0bf4a63d00a776 + c2bbb6a5ee5ff67e5e8353e154d7b4c4f2f83143 - + https://github.com/dotnet/corefx - c38c10d28e223aeea2f363a6ef0bf4a63d00a776 + c2bbb6a5ee5ff67e5e8353e154d7b4c4f2f83143 - + https://github.com/dotnet/corefx - c38c10d28e223aeea2f363a6ef0bf4a63d00a776 + c2bbb6a5ee5ff67e5e8353e154d7b4c4f2f83143 - + https://github.com/dotnet/corefx - c38c10d28e223aeea2f363a6ef0bf4a63d00a776 + c2bbb6a5ee5ff67e5e8353e154d7b4c4f2f83143 - + https://github.com/dotnet/corefx - c38c10d28e223aeea2f363a6ef0bf4a63d00a776 + c2bbb6a5ee5ff67e5e8353e154d7b4c4f2f83143 - + https://github.com/dotnet/corefx - c38c10d28e223aeea2f363a6ef0bf4a63d00a776 + c2bbb6a5ee5ff67e5e8353e154d7b4c4f2f83143 - + https://github.com/dotnet/corefx - c38c10d28e223aeea2f363a6ef0bf4a63d00a776 + c2bbb6a5ee5ff67e5e8353e154d7b4c4f2f83143 - + https://github.com/dotnet/corefx - c38c10d28e223aeea2f363a6ef0bf4a63d00a776 + c2bbb6a5ee5ff67e5e8353e154d7b4c4f2f83143 - + https://github.com/dotnet/corefx - c38c10d28e223aeea2f363a6ef0bf4a63d00a776 + c2bbb6a5ee5ff67e5e8353e154d7b4c4f2f83143 - + https://github.com/dotnet/corefx - c38c10d28e223aeea2f363a6ef0bf4a63d00a776 + c2bbb6a5ee5ff67e5e8353e154d7b4c4f2f83143 - + https://github.com/dotnet/corefx - c38c10d28e223aeea2f363a6ef0bf4a63d00a776 + c2bbb6a5ee5ff67e5e8353e154d7b4c4f2f83143 - + https://github.com/dotnet/corefx - c38c10d28e223aeea2f363a6ef0bf4a63d00a776 + c2bbb6a5ee5ff67e5e8353e154d7b4c4f2f83143 - + https://github.com/dotnet/corefx - c38c10d28e223aeea2f363a6ef0bf4a63d00a776 + c2bbb6a5ee5ff67e5e8353e154d7b4c4f2f83143 - + https://github.com/dotnet/corefx - c38c10d28e223aeea2f363a6ef0bf4a63d00a776 + c2bbb6a5ee5ff67e5e8353e154d7b4c4f2f83143 - + https://github.com/dotnet/corefx - c38c10d28e223aeea2f363a6ef0bf4a63d00a776 + c2bbb6a5ee5ff67e5e8353e154d7b4c4f2f83143 - + https://github.com/dotnet/corefx - c38c10d28e223aeea2f363a6ef0bf4a63d00a776 + c2bbb6a5ee5ff67e5e8353e154d7b4c4f2f83143 - + https://github.com/dotnet/corefx - c38c10d28e223aeea2f363a6ef0bf4a63d00a776 + c2bbb6a5ee5ff67e5e8353e154d7b4c4f2f83143 - + https://github.com/dotnet/corefx - c38c10d28e223aeea2f363a6ef0bf4a63d00a776 + c2bbb6a5ee5ff67e5e8353e154d7b4c4f2f83143 - + https://github.com/dotnet/corefx - c38c10d28e223aeea2f363a6ef0bf4a63d00a776 + c2bbb6a5ee5ff67e5e8353e154d7b4c4f2f83143 - + https://github.com/dotnet/core-setup - dfadb971c4a8ae25d352a90c1b523d290c3cae51 + db1192ffb46bbdca9037f874b7d40f1a4950acab - + https://github.com/dotnet/core-setup - dfadb971c4a8ae25d352a90c1b523d290c3cae51 + db1192ffb46bbdca9037f874b7d40f1a4950acab - + https://github.com/dotnet/core-setup - dfadb971c4a8ae25d352a90c1b523d290c3cae51 + db1192ffb46bbdca9037f874b7d40f1a4950acab diff --git a/eng/Versions.props b/eng/Versions.props index 15093eaefeaf..fd7e1d5cc47f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,33 +18,33 @@ --> - 3.0.0-preview-27408-1 - 3.0.0-preview-27408-1 - 3.0.0-preview-27408-1 + 3.0.0-preview-27408-2 + 3.0.0-preview-27408-2 + 3.0.0-preview-27408-2 - 4.6.0-preview.19106.2 - 4.6.0-preview.19106.2 - 4.6.0-preview.19106.2 - 4.6.0-preview.19106.2 - 4.7.0-preview.19106.2 - 4.6.0-preview.19106.2 - 4.6.0-preview.19106.2 - 4.6.0-preview.19106.2 - 4.6.0-preview.19106.2 - 4.6.0-preview.19106.2 - 4.6.0-preview.19106.2 - 1.7.0-preview.19106.2 - 4.6.0-preview.19106.2 - 4.6.0-preview.19106.2 - 4.6.0-preview.19106.2 - 4.6.0-preview.19106.2 - 4.6.0-preview.19106.2 - 4.6.0-preview.19106.2 - 4.6.0-preview.19106.2 - 4.6.0-preview.19106.2 - 4.6.0-preview.19106.2 + 4.6.0-preview.19107.9 + 4.6.0-preview.19107.9 + 4.6.0-preview.19107.9 + 4.6.0-preview.19107.9 + 4.7.0-preview.19107.9 + 4.6.0-preview.19107.9 + 4.6.0-preview.19107.9 + 4.6.0-preview.19107.9 + 4.6.0-preview.19107.9 + 4.6.0-preview.19107.9 + 4.6.0-preview.19107.9 + 1.7.0-preview.19107.9 + 4.6.0-preview.19107.9 + 4.6.0-preview.19107.9 + 4.6.0-preview.19107.9 + 4.6.0-preview.19107.9 + 4.6.0-preview.19107.9 + 4.6.0-preview.19107.9 + 4.6.0-preview.19107.9 + 4.6.0-preview.19107.9 + 4.6.0-preview.19107.9 - 3.0.0-preview.19106.2 + 3.0.0-preview.19107.9 3.0.0-preview.19105.4 3.0.0-preview.19105.4 From 776bf1e0dfd9a43e33916449b2f8d4249c8cff94 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 8 Feb 2019 16:19:19 -0800 Subject: [PATCH 20/60] Update C++ toolset to v142 Workaround https://developercommunity.visualstudio.com/content/problem/434385/vs2019-preview-2-targetframeworkversion-or-platfor.html --- .../CustomAction/aspnetcoreCA.vcxproj | 2 +- .../IIS-Setup/IIS-Common/lib/CommonLib.vcxproj | 2 +- .../IIS-Setup/IIS-Common/reftrace/reftrace.vcxproj | 2 +- .../IIS-Setup/iisca/lib/iisca.vcxproj | 2 +- .../IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj | 8 ++++---- .../IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj | 8 ++++---- .../CommonLibTests/CommonLibTests.vcxproj | 2 +- src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj | 8 ++++---- .../InProcessRequestHandler.vcxproj | 8 ++++---- .../OutOfProcessRequestHandler.vcxproj | 8 ++++---- .../RequestHandlerLib/RequestHandlerLib.vcxproj | 8 ++++---- src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj | 8 ++++---- src/Servers/IIS/build/Build.Settings | 2 +- .../HubConnectionSample/HubConnectionSample.vcxproj | 4 ++-- .../PersistentConnectionSample.vcxproj | 4 ++-- .../cpp/src/signalrclient/Build/VS/signalrclient.vcxproj | 8 ++++---- .../signalrclientdll/Build/VS/signalrclientdll.vcxproj | 8 ++++---- src/SignalR/clients/cpp/test/gtest/gtest.vcxproj | 8 ++++---- .../Build/VS/signalrclient-e2e-tests.vcxproj | 8 ++++---- .../Build/VS/signalrclienttests.vcxproj | 8 ++++---- 20 files changed, 58 insertions(+), 58 deletions(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj index b30439759482..b98ce7abd5fa 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj @@ -41,7 +41,7 @@ DynamicLibrary - v141 + v142 Unicode diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/CommonLib.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/CommonLib.vcxproj index 3eaa339620b3..cb9509cbdce2 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/CommonLib.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/CommonLib.vcxproj @@ -31,7 +31,7 @@ StaticLibrary - v141 + v142 false diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/reftrace/reftrace.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/reftrace/reftrace.vcxproj index 257df53c477f..8d1093181d67 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/reftrace/reftrace.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/reftrace/reftrace.vcxproj @@ -47,7 +47,7 @@ StaticLibrary - v141 + v142 true diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj index b1b76b9b0879..4e737efc658a 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj @@ -74,7 +74,7 @@ StaticLibrary Unicode - v141 + v142 diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj index 9cd9c724eaeb..da09ebd6fd1b 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj @@ -31,26 +31,26 @@ DynamicLibrary true - v141 + v142 Unicode DynamicLibrary true - v141 + v142 Unicode DynamicLibrary false - v141 + v142 true Unicode DynamicLibrary false - v141 + v142 true Unicode diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index 913c11f077f0..837ebba93d39 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -29,26 +29,26 @@ StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 false Unicode diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj index ab6ef63e1065..5189d83678b1 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj @@ -22,7 +22,7 @@ Win32Proj 10.0.17134.0 Application - v141 + v142 Unicode diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj index aba60e9aab9d..17661de13997 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj @@ -29,26 +29,26 @@ StaticLibrary true - v141 + v142 Unicode StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj index 6eb6cb55baa0..9459a36960bc 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj @@ -31,26 +31,26 @@ DynamicLibrary true - v141 + v142 Unicode DynamicLibrary false - v141 + v142 true Unicode DynamicLibrary true - v141 + v142 Unicode DynamicLibrary false - v141 + v142 true Unicode diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj index 343171414906..6ed994963c1d 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj @@ -31,26 +31,26 @@ DynamicLibrary true - v141 + v142 Unicode DynamicLibrary false - v141 + v142 true Unicode DynamicLibrary true - v141 + v142 Unicode DynamicLibrary false - v141 + v142 true Unicode diff --git a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj index e94c099487c7..84f2efb1558a 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj @@ -29,26 +29,26 @@ StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 false Unicode diff --git a/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj index 7167a654c54d..0c36c6c31c09 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj @@ -33,14 +33,14 @@ StaticLibrary true - v141 + v142 Unicode gtestd StaticLibrary false - v141 + v142 true Unicode gtest @@ -48,14 +48,14 @@ StaticLibrary true - v141 + v142 Unicode gtestd StaticLibrary false - v141 + v142 true Unicode gtest diff --git a/src/Servers/IIS/build/Build.Settings b/src/Servers/IIS/build/Build.Settings index e68136bb2b10..4ae169416e18 100644 --- a/src/Servers/IIS/build/Build.Settings +++ b/src/Servers/IIS/build/Build.Settings @@ -4,7 +4,7 @@ $(MSBuildThisFileDirectory)..\ Debug Win32 - v141 + v142 $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ $(OutputPath) aspnetcore diff --git a/src/SignalR/clients/cpp/samples/HubConnectionSample/HubConnectionSample.vcxproj b/src/SignalR/clients/cpp/samples/HubConnectionSample/HubConnectionSample.vcxproj index d3f7026e487d..41429345a01f 100644 --- a/src/SignalR/clients/cpp/samples/HubConnectionSample/HubConnectionSample.vcxproj +++ b/src/SignalR/clients/cpp/samples/HubConnectionSample/HubConnectionSample.vcxproj @@ -24,13 +24,13 @@ Application true - v141 + v142 Unicode Application false - v141 + v142 true Unicode diff --git a/src/SignalR/clients/cpp/samples/PersistentConnectionSample/PersistentConnectionSample.vcxproj b/src/SignalR/clients/cpp/samples/PersistentConnectionSample/PersistentConnectionSample.vcxproj index 06064783a4a3..5f74643acf56 100644 --- a/src/SignalR/clients/cpp/samples/PersistentConnectionSample/PersistentConnectionSample.vcxproj +++ b/src/SignalR/clients/cpp/samples/PersistentConnectionSample/PersistentConnectionSample.vcxproj @@ -23,13 +23,13 @@ Application true - v141 + v142 Unicode Application false - v141 + v142 true Unicode diff --git a/src/SignalR/clients/cpp/src/signalrclient/Build/VS/signalrclient.vcxproj b/src/SignalR/clients/cpp/src/signalrclient/Build/VS/signalrclient.vcxproj index c74fbdc9a9ae..1295ddbda17f 100644 --- a/src/SignalR/clients/cpp/src/signalrclient/Build/VS/signalrclient.vcxproj +++ b/src/SignalR/clients/cpp/src/signalrclient/Build/VS/signalrclient.vcxproj @@ -17,16 +17,16 @@ - v141 + v142 - v141 + v142 - v141 + v142 - v141 + v142 diff --git a/src/SignalR/clients/cpp/src/signalrclientdll/Build/VS/signalrclientdll.vcxproj b/src/SignalR/clients/cpp/src/signalrclientdll/Build/VS/signalrclientdll.vcxproj index 2fba0aff2f18..25583bcadb74 100644 --- a/src/SignalR/clients/cpp/src/signalrclientdll/Build/VS/signalrclientdll.vcxproj +++ b/src/SignalR/clients/cpp/src/signalrclientdll/Build/VS/signalrclientdll.vcxproj @@ -17,16 +17,16 @@ - v141 + v142 - v141 + v142 - v141 + v142 - v141 + v142 diff --git a/src/SignalR/clients/cpp/test/gtest/gtest.vcxproj b/src/SignalR/clients/cpp/test/gtest/gtest.vcxproj index 41b0f95a4f8d..163e712b00ef 100644 --- a/src/SignalR/clients/cpp/test/gtest/gtest.vcxproj +++ b/src/SignalR/clients/cpp/test/gtest/gtest.vcxproj @@ -32,14 +32,14 @@ StaticLibrary true - v141 + v142 Unicode gtestd StaticLibrary false - v141 + v142 true Unicode gtest @@ -47,14 +47,14 @@ StaticLibrary true - v141 + v142 Unicode gtestd StaticLibrary false - v141 + v142 true Unicode gtest diff --git a/src/SignalR/clients/cpp/test/signalrclient-e2e-tests/Build/VS/signalrclient-e2e-tests.vcxproj b/src/SignalR/clients/cpp/test/signalrclient-e2e-tests/Build/VS/signalrclient-e2e-tests.vcxproj index 0cb16d4a30aa..79390709da9b 100644 --- a/src/SignalR/clients/cpp/test/signalrclient-e2e-tests/Build/VS/signalrclient-e2e-tests.vcxproj +++ b/src/SignalR/clients/cpp/test/signalrclient-e2e-tests/Build/VS/signalrclient-e2e-tests.vcxproj @@ -13,16 +13,16 @@ - v141 + v142 - v141 + v142 - v141 + v142 - v141 + v142 diff --git a/src/SignalR/clients/cpp/test/signalrclienttests/Build/VS/signalrclienttests.vcxproj b/src/SignalR/clients/cpp/test/signalrclienttests/Build/VS/signalrclienttests.vcxproj index 150f9487d961..841aa0192ebd 100644 --- a/src/SignalR/clients/cpp/test/signalrclienttests/Build/VS/signalrclienttests.vcxproj +++ b/src/SignalR/clients/cpp/test/signalrclienttests/Build/VS/signalrclienttests.vcxproj @@ -13,16 +13,16 @@ - v141 + v142 - v141 + v142 - v141 + v142 - v141 + v142 From f6ed6af6cc5c1abb60d4612379a812c3132541e5 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 8 Feb 2019 17:06:33 -0800 Subject: [PATCH 21/60] Require Microsoft.VisualStudio.Workload.VisualStudioExtension --- korebuild.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/korebuild.json b/korebuild.json index 93b7433226c4..51a6a0dd1b4c 100644 --- a/korebuild.json +++ b/korebuild.json @@ -16,7 +16,8 @@ "requiredWorkloads": [ "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", "Microsoft.VisualStudio.Component.VC.ATL", - "Microsoft.VisualStudio.Component.Windows10SDK.17134" + "Microsoft.VisualStudio.Component.Windows10SDK.17134", + "Microsoft.VisualStudio.Workload.VisualStudioExtension" ] } } From 4c37c2c77b1ae1fcad6023c04aaef082ff81d31c Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 11 Feb 2019 09:11:22 -0800 Subject: [PATCH 22/60] Revert to v141 toolset --- .../CustomAction/aspnetcoreCA.vcxproj | 2 +- .../IIS-Common/lib/CommonLib.vcxproj | 2 +- .../IIS-Common/reftrace/reftrace.vcxproj | 2 +- .../IIS-Setup/iisca/lib/iisca.vcxproj | 2 +- .../test/FunctionalTests/package-lock.json | 45 +++++++++++-------- .../CORS/test/FunctionalTests/package.json | 2 +- .../AspNetCore/AspNetCore.vcxproj | 8 ++-- .../CommonLib/CommonLib.vcxproj | 8 ++-- .../CommonLibTests/CommonLibTests.vcxproj | 2 +- .../AspNetCoreModuleV2/IISLib/IISLib.vcxproj | 8 ++-- .../InProcessRequestHandler.vcxproj | 8 ++-- .../OutOfProcessRequestHandler.vcxproj | 8 ++-- .../RequestHandlerLib.vcxproj | 8 ++-- .../AspNetCoreModuleV2/gtest/gtest.vcxproj | 8 ++-- src/Servers/IIS/build/Build.Settings | 2 +- .../HubConnectionSample.vcxproj | 4 +- .../PersistentConnectionSample.vcxproj | 4 +- .../Build/VS/signalrclient.vcxproj | 8 ++-- .../Build/VS/signalrclientdll.vcxproj | 8 ++-- .../clients/cpp/test/gtest/gtest.vcxproj | 8 ++-- .../Build/VS/signalrclient-e2e-tests.vcxproj | 8 ++-- .../Build/VS/signalrclienttests.vcxproj | 8 ++-- 22 files changed, 86 insertions(+), 77 deletions(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj index b98ce7abd5fa..b30439759482 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj @@ -41,7 +41,7 @@ DynamicLibrary - v142 + v141 Unicode diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/CommonLib.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/CommonLib.vcxproj index cb9509cbdce2..3eaa339620b3 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/CommonLib.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/CommonLib.vcxproj @@ -31,7 +31,7 @@ StaticLibrary - v142 + v141 false diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/reftrace/reftrace.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/reftrace/reftrace.vcxproj index 8d1093181d67..257df53c477f 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/reftrace/reftrace.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/reftrace/reftrace.vcxproj @@ -47,7 +47,7 @@ StaticLibrary - v142 + v141 true diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj index 4e737efc658a..b1b76b9b0879 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj @@ -74,7 +74,7 @@ StaticLibrary Unicode - v142 + v141 diff --git a/src/Middleware/CORS/test/FunctionalTests/package-lock.json b/src/Middleware/CORS/test/FunctionalTests/package-lock.json index 4f6bda1b10bd..7b926ee09175 100644 --- a/src/Middleware/CORS/test/FunctionalTests/package-lock.json +++ b/src/Middleware/CORS/test/FunctionalTests/package-lock.json @@ -2434,9 +2434,9 @@ }, "dependencies": { "debug": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.5.tgz", - "integrity": "sha512-D61LaDQPQkxJ5AUM2mbSJRbPkNs/TmdmOeLAi1hgDkpDfIfetSrjmWhccwtuResSwMbACjx/xXQofvM9CE/aeg==", + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "dev": true, "requires": { "ms": "^2.1.1" @@ -3542,9 +3542,9 @@ } }, "mime": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz", - "integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz", + "integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==", "dev": true }, "mime-db": { @@ -4084,9 +4084,9 @@ "dev": true }, "progress": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz", - "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", "dev": true }, "prompts": { @@ -4124,25 +4124,25 @@ "dev": true }, "puppeteer": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-1.8.0.tgz", - "integrity": "sha512-wJ7Fxs03l4dy/ZXQACUKBBobIuJaS4NHq44q7/QinpAXFMwJMJFEIPjzoksVzUhZxQe+RXnjXH69mg13yMh0BA==", + "version": "1.12.2", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-1.12.2.tgz", + "integrity": "sha512-xWSyCeD6EazGlfnQweMpM+Hs6X6PhUYhNTHKFj/axNZDq4OmrVERf70isBf7HsnFgB3zOC1+23/8+wCAZYg+Pg==", "dev": true, "requires": { - "debug": "^3.1.0", + "debug": "^4.1.0", "extract-zip": "^1.6.6", "https-proxy-agent": "^2.2.1", "mime": "^2.0.3", - "progress": "^2.0.0", + "progress": "^2.0.1", "proxy-from-env": "^1.0.0", "rimraf": "^2.6.1", - "ws": "^5.1.1" + "ws": "^6.1.0" }, "dependencies": { "debug": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.5.tgz", - "integrity": "sha512-D61LaDQPQkxJ5AUM2mbSJRbPkNs/TmdmOeLAi1hgDkpDfIfetSrjmWhccwtuResSwMbACjx/xXQofvM9CE/aeg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "requires": { "ms": "^2.1.1" @@ -4153,6 +4153,15 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", "dev": true + }, + "ws": { + "version": "6.1.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.3.tgz", + "integrity": "sha512-tbSxiT+qJI223AP4iLfQbkbxkwdFcneYinM2+x46Gx2wgvbaOMO36czfdfVUBRTHvzAMRhDd98sA5d/BuWbQdg==", + "dev": true, + "requires": { + "async-limiter": "~1.0.0" + } } } }, diff --git a/src/Middleware/CORS/test/FunctionalTests/package.json b/src/Middleware/CORS/test/FunctionalTests/package.json index 1fdb5c3fc697..11fcdca42555 100644 --- a/src/Middleware/CORS/test/FunctionalTests/package.json +++ b/src/Middleware/CORS/test/FunctionalTests/package.json @@ -2,7 +2,7 @@ "devDependencies": { "jest": "^23.6.0", "merge": "^1.2.1", - "puppeteer": "^1.8.0" + "puppeteer": "^1.12.2" }, "dependencies": {}, "scripts": { diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj index da09ebd6fd1b..9cd9c724eaeb 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj @@ -31,26 +31,26 @@ DynamicLibrary true - v142 + v141 Unicode DynamicLibrary true - v142 + v141 Unicode DynamicLibrary false - v142 + v141 true Unicode DynamicLibrary false - v142 + v141 true Unicode diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index 837ebba93d39..913c11f077f0 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -29,26 +29,26 @@ StaticLibrary true - v142 + v141 Unicode StaticLibrary false - v142 + v141 true Unicode StaticLibrary true - v142 + v141 Unicode StaticLibrary false - v142 + v141 false Unicode diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj index 5189d83678b1..ab6ef63e1065 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj @@ -22,7 +22,7 @@ Win32Proj 10.0.17134.0 Application - v142 + v141 Unicode diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj index 17661de13997..aba60e9aab9d 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj @@ -29,26 +29,26 @@ StaticLibrary true - v142 + v141 Unicode StaticLibrary true - v142 + v141 Unicode StaticLibrary false - v142 + v141 true Unicode StaticLibrary false - v142 + v141 true Unicode diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj index 9459a36960bc..6eb6cb55baa0 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj @@ -31,26 +31,26 @@ DynamicLibrary true - v142 + v141 Unicode DynamicLibrary false - v142 + v141 true Unicode DynamicLibrary true - v142 + v141 Unicode DynamicLibrary false - v142 + v141 true Unicode diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj index 6ed994963c1d..343171414906 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj @@ -31,26 +31,26 @@ DynamicLibrary true - v142 + v141 Unicode DynamicLibrary false - v142 + v141 true Unicode DynamicLibrary true - v142 + v141 Unicode DynamicLibrary false - v142 + v141 true Unicode diff --git a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj index 84f2efb1558a..e94c099487c7 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj @@ -29,26 +29,26 @@ StaticLibrary true - v142 + v141 Unicode StaticLibrary false - v142 + v141 true Unicode StaticLibrary true - v142 + v141 Unicode StaticLibrary false - v142 + v141 false Unicode diff --git a/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj index 0c36c6c31c09..7167a654c54d 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj @@ -33,14 +33,14 @@ StaticLibrary true - v142 + v141 Unicode gtestd StaticLibrary false - v142 + v141 true Unicode gtest @@ -48,14 +48,14 @@ StaticLibrary true - v142 + v141 Unicode gtestd StaticLibrary false - v142 + v141 true Unicode gtest diff --git a/src/Servers/IIS/build/Build.Settings b/src/Servers/IIS/build/Build.Settings index 4ae169416e18..e68136bb2b10 100644 --- a/src/Servers/IIS/build/Build.Settings +++ b/src/Servers/IIS/build/Build.Settings @@ -4,7 +4,7 @@ $(MSBuildThisFileDirectory)..\ Debug Win32 - v142 + v141 $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ $(OutputPath) aspnetcore diff --git a/src/SignalR/clients/cpp/samples/HubConnectionSample/HubConnectionSample.vcxproj b/src/SignalR/clients/cpp/samples/HubConnectionSample/HubConnectionSample.vcxproj index 41429345a01f..d3f7026e487d 100644 --- a/src/SignalR/clients/cpp/samples/HubConnectionSample/HubConnectionSample.vcxproj +++ b/src/SignalR/clients/cpp/samples/HubConnectionSample/HubConnectionSample.vcxproj @@ -24,13 +24,13 @@ Application true - v142 + v141 Unicode Application false - v142 + v141 true Unicode diff --git a/src/SignalR/clients/cpp/samples/PersistentConnectionSample/PersistentConnectionSample.vcxproj b/src/SignalR/clients/cpp/samples/PersistentConnectionSample/PersistentConnectionSample.vcxproj index 5f74643acf56..06064783a4a3 100644 --- a/src/SignalR/clients/cpp/samples/PersistentConnectionSample/PersistentConnectionSample.vcxproj +++ b/src/SignalR/clients/cpp/samples/PersistentConnectionSample/PersistentConnectionSample.vcxproj @@ -23,13 +23,13 @@ Application true - v142 + v141 Unicode Application false - v142 + v141 true Unicode diff --git a/src/SignalR/clients/cpp/src/signalrclient/Build/VS/signalrclient.vcxproj b/src/SignalR/clients/cpp/src/signalrclient/Build/VS/signalrclient.vcxproj index 1295ddbda17f..c74fbdc9a9ae 100644 --- a/src/SignalR/clients/cpp/src/signalrclient/Build/VS/signalrclient.vcxproj +++ b/src/SignalR/clients/cpp/src/signalrclient/Build/VS/signalrclient.vcxproj @@ -17,16 +17,16 @@ - v142 + v141 - v142 + v141 - v142 + v141 - v142 + v141 diff --git a/src/SignalR/clients/cpp/src/signalrclientdll/Build/VS/signalrclientdll.vcxproj b/src/SignalR/clients/cpp/src/signalrclientdll/Build/VS/signalrclientdll.vcxproj index 25583bcadb74..2fba0aff2f18 100644 --- a/src/SignalR/clients/cpp/src/signalrclientdll/Build/VS/signalrclientdll.vcxproj +++ b/src/SignalR/clients/cpp/src/signalrclientdll/Build/VS/signalrclientdll.vcxproj @@ -17,16 +17,16 @@ - v142 + v141 - v142 + v141 - v142 + v141 - v142 + v141 diff --git a/src/SignalR/clients/cpp/test/gtest/gtest.vcxproj b/src/SignalR/clients/cpp/test/gtest/gtest.vcxproj index 163e712b00ef..41b0f95a4f8d 100644 --- a/src/SignalR/clients/cpp/test/gtest/gtest.vcxproj +++ b/src/SignalR/clients/cpp/test/gtest/gtest.vcxproj @@ -32,14 +32,14 @@ StaticLibrary true - v142 + v141 Unicode gtestd StaticLibrary false - v142 + v141 true Unicode gtest @@ -47,14 +47,14 @@ StaticLibrary true - v142 + v141 Unicode gtestd StaticLibrary false - v142 + v141 true Unicode gtest diff --git a/src/SignalR/clients/cpp/test/signalrclient-e2e-tests/Build/VS/signalrclient-e2e-tests.vcxproj b/src/SignalR/clients/cpp/test/signalrclient-e2e-tests/Build/VS/signalrclient-e2e-tests.vcxproj index 79390709da9b..0cb16d4a30aa 100644 --- a/src/SignalR/clients/cpp/test/signalrclient-e2e-tests/Build/VS/signalrclient-e2e-tests.vcxproj +++ b/src/SignalR/clients/cpp/test/signalrclient-e2e-tests/Build/VS/signalrclient-e2e-tests.vcxproj @@ -13,16 +13,16 @@ - v142 + v141 - v142 + v141 - v142 + v141 - v142 + v141 diff --git a/src/SignalR/clients/cpp/test/signalrclienttests/Build/VS/signalrclienttests.vcxproj b/src/SignalR/clients/cpp/test/signalrclienttests/Build/VS/signalrclienttests.vcxproj index 841aa0192ebd..150f9487d961 100644 --- a/src/SignalR/clients/cpp/test/signalrclienttests/Build/VS/signalrclienttests.vcxproj +++ b/src/SignalR/clients/cpp/test/signalrclienttests/Build/VS/signalrclienttests.vcxproj @@ -13,16 +13,16 @@ - v142 + v141 - v142 + v141 - v142 + v141 - v142 + v141 From a9130f84e5c1793383ef9d011536acbb4289f426 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 11 Feb 2019 09:32:30 -0800 Subject: [PATCH 23/60] Add v141 and VC 14.16 tools to require workloads --- eng/scripts/vs.json | 2 ++ korebuild.json | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/eng/scripts/vs.json b/eng/scripts/vs.json index 04259724b2c8..91c8701cf85c 100644 --- a/eng/scripts/vs.json +++ b/eng/scripts/vs.json @@ -15,6 +15,8 @@ "Microsoft.Net.Component.4.6.1.TargetingPack", "Microsoft.VisualStudio.Component.Azure.Storage.Emulator", "Microsoft.VisualStudio.Component.VC.ATL", + "Microsoft.VisualStudio.Component.VC.Tools.14.16", + "Microsoft.VisualStudio.Component.VC.v141", "Microsoft.VisualStudio.Component.Windows10SDK.17134", "Microsoft.VisualStudio.Workload.ManagedDesktop", "Microsoft.VisualStudio.Workload.NetWeb", diff --git a/korebuild.json b/korebuild.json index 51a6a0dd1b4c..94430b176fae 100644 --- a/korebuild.json +++ b/korebuild.json @@ -14,11 +14,13 @@ "includePrerelease": true, "versionRange": "[16.0,17.0)", "requiredWorkloads": [ - "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", "Microsoft.VisualStudio.Component.VC.ATL", + "Microsoft.VisualStudio.Component.VC.Tools.14.16", + "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", + "Microsoft.VisualStudio.Component.VC.v141", "Microsoft.VisualStudio.Component.Windows10SDK.17134", "Microsoft.VisualStudio.Workload.VisualStudioExtension" ] } } -} +} \ No newline at end of file From 80bcfccfe55e8953bed4bbe63a797f2be6b277d1 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 11 Feb 2019 14:14:32 -0800 Subject: [PATCH 24/60] Don't produce binlog --- .azure/pipelines/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index cd29d1010b2e..9c8c25aeebf9 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -51,7 +51,7 @@ jobs: # if they have already been signed. This results in slower builds due to re-submitting the same .nupkg many times for signing. # The sign settings have been configured to - - script: ./eng/scripts/cibuild.cmd -arch x64 /p:DisableCodeSigning=true /bl:artifacts/logs/build.msbuild.binlog + - script: ./eng/scripts/cibuild.cmd -arch x64 /p:DisableCodeSigning=true displayName: Build x64 # TODO: make it possible to build for one Windows architecture at a time # This is going to actually build x86 native assets. See https://github.com/aspnet/AspNetCore/issues/7196 From d6dd193ecd9f3ab36c8a9fcc50bcc71a7cf1b778 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 11 Feb 2019 14:20:40 -0800 Subject: [PATCH 25/60] Update template tests workarounds --- .../test/GenerateTestProps.targets | 3 +- .../test/Helpers/TemplateTestBase.cs | 31 +------------------ .../test/TemplateTests.props.in | 20 +++++++++--- 3 files changed, 18 insertions(+), 36 deletions(-) diff --git a/src/ProjectTemplates/test/GenerateTestProps.targets b/src/ProjectTemplates/test/GenerateTestProps.targets index 72ea31538705..5bdf66c79c50 100644 --- a/src/ProjectTemplates/test/GenerateTestProps.targets +++ b/src/ProjectTemplates/test/GenerateTestProps.targets @@ -3,8 +3,9 @@ RestoreSources=$([MSBuild]::Escape("$(RestoreSources);$(ArtifactsShippingPackagesDir);$(ArtifactsNonShippingPackagesDir)")); - RuntimeFrameworkVersion=$(RuntimeFrameworkVersion); + MicrosoftNETCoreAppPackageVersion=$(MicrosoftNETCoreAppPackageVersion); MicrosoftNETSdkRazorPackageVersion=$(MicrosoftNETSdkRazorPackageVersion); + MicrosoftAspNetCoreAppPackageVersion=$(SharedFxVersion); MicrosoftAspNetCoreAppPackageVersion=$(SharedFxVersion) diff --git a/src/ProjectTemplates/test/Helpers/TemplateTestBase.cs b/src/ProjectTemplates/test/Helpers/TemplateTestBase.cs index 5aee2f0af950..3aabb3efd0f1 100644 --- a/src/ProjectTemplates/test/Helpers/TemplateTestBase.cs +++ b/src/ProjectTemplates/test/Helpers/TemplateTestBase.cs @@ -22,7 +22,6 @@ public class TemplateTestBase : IDisposable protected string ProjectName { get; set; } protected string ProjectGuid { get; set; } protected string TemplateOutputDir { get; set; } - protected bool UseRazorSdkPackage { get; set; } = true; public static ITestOutputHelper Output => _output.Value; @@ -63,8 +62,6 @@ public TemplateTestBase(ITestOutputHelper output) protected void RunDotNetNew(string templateName, string auth = null, string language = null, bool useLocalDB = false, bool noHttps = false) { - SetAfterDirectoryBuildPropsContents(); - var args = $"new {templateName} --debug:custom-hive \"{TemplatePackageInstaller.CustomHivePath}\""; if (!string.IsNullOrEmpty(auth)) @@ -95,32 +92,6 @@ protected void RunDotNetNew(string templateName, string auth = null, string lang } } - protected void SetAfterDirectoryBuildPropsContents() - { - var content = GetAfterDirectoryBuildPropsContent(); - if (!string.IsNullOrEmpty(content)) - { - content = "" + Environment.NewLine + content + Environment.NewLine + ""; - File.WriteAllText(Path.Combine(TemplateOutputDir, "Directory.Build.After.props"), content); - } - } - - protected virtual string GetAfterDirectoryBuildPropsContent() - { - var content = string.Empty; - if (UseRazorSdkPackage) - { - content += -@" - - - -"; - } - - return content; - } - protected void RunDotNet(string arguments) { lock (DotNetNewLock) @@ -180,7 +151,7 @@ protected override void Down(MigrationBuilder migrationBuilder) { }"; - + // This comparison can break depending on how GIT checked out newlines on different files. Assert.Contains(RemoveNewLines(emptyMigration), RemoveNewLines(contents)); } diff --git a/src/ProjectTemplates/test/TemplateTests.props.in b/src/ProjectTemplates/test/TemplateTests.props.in index 9353422afa04..ff2c8a9cc41d 100644 --- a/src/ProjectTemplates/test/TemplateTests.props.in +++ b/src/ProjectTemplates/test/TemplateTests.props.in @@ -2,12 +2,17 @@ true ${RestoreSources} - ${RuntimeFrameworkVersion} - ${MicrosoftNETSdkRazorPackageVersion} - AspNetCoreModuleV2 + + ${MicrosoftNETCorePlatformsPackageVersion} + + - - + + + + From 7cf24f127cec09852d65f64752ea2b7cc834145e Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 11 Feb 2019 15:29:09 -0800 Subject: [PATCH 26/60] Override nuget restore path for template tests --- build/repo.props | 2 +- .../test/GenerateTestProps.targets | 2 +- src/ProjectTemplates/test/Helpers/ProcessEx.cs | 14 ++++++++++++-- .../test/ProjectTemplates.Tests.csproj | 4 ++++ 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/build/repo.props b/build/repo.props index b8a6ec4e6e7f..73908405d815 100644 --- a/build/repo.props +++ b/build/repo.props @@ -78,7 +78,7 @@ - + false diff --git a/src/ProjectTemplates/test/GenerateTestProps.targets b/src/ProjectTemplates/test/GenerateTestProps.targets index 5bdf66c79c50..5112861a1cae 100644 --- a/src/ProjectTemplates/test/GenerateTestProps.targets +++ b/src/ProjectTemplates/test/GenerateTestProps.targets @@ -4,9 +4,9 @@ RestoreSources=$([MSBuild]::Escape("$(RestoreSources);$(ArtifactsShippingPackagesDir);$(ArtifactsNonShippingPackagesDir)")); MicrosoftNETCoreAppPackageVersion=$(MicrosoftNETCoreAppPackageVersion); + MicrosoftNETCorePlatformsPackageVersion=$(MicrosoftNETCorePlatformsPackageVersion); MicrosoftNETSdkRazorPackageVersion=$(MicrosoftNETSdkRazorPackageVersion); MicrosoftAspNetCoreAppPackageVersion=$(SharedFxVersion); - MicrosoftAspNetCoreAppPackageVersion=$(SharedFxVersion) diff --git a/src/ProjectTemplates/test/Helpers/ProcessEx.cs b/src/ProjectTemplates/test/Helpers/ProcessEx.cs index 80b2e83f2f87..288cad0c4232 100644 --- a/src/ProjectTemplates/test/Helpers/ProcessEx.cs +++ b/src/ProjectTemplates/test/Helpers/ProcessEx.cs @@ -1,17 +1,25 @@ -using Microsoft.Extensions.Internal; -using System; +using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Diagnostics; +using System.IO; +using System.Linq; +using System.Reflection; using System.Runtime.InteropServices; using System.Text; using System.Threading.Tasks; +using Microsoft.Extensions.Internal; using Xunit.Abstractions; namespace Templates.Test.Helpers { internal class ProcessEx : IDisposable { + private static readonly string NUGET_PACKAGES = typeof(ProcessEx).Assembly + .GetCustomAttributes() + .First(attribute => attribute.Key == "TestPackageRestorePath") + .Value; + private readonly ITestOutputHelper _output; private readonly Process _process; private readonly StringBuilder _stderrCapture; @@ -39,6 +47,8 @@ public static ProcessEx Run(ITestOutputHelper output, string workingDirectory, s } } + startInfo.EnvironmentVariables["NUGET_PACKAGES"] = NUGET_PACKAGES; + output.WriteLine($"==> {startInfo.FileName} {startInfo.Arguments} [{startInfo.WorkingDirectory}]"); var proc = Process.Start(startInfo); diff --git a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj index 92df65c73624..a62e511705db 100644 --- a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj +++ b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj @@ -39,6 +39,10 @@ <_Parameter1>DotNetEfFullPath <_Parameter2>$([MSBuild]::EnsureTrailingSlash('$(NuGetPackageRoot)'))dotnet-ef/$(DotnetEfPackageVersion)/tools/netcoreapp3.0/any/dotnet-ef.dll + + <_Parameter1>TestPackageRestorePath + <_Parameter2>$([MSBuild]::EnsureTrailingSlash('$(RepositoryRoot)'))obj\template-restore\ + From 03ac76e2769aaaee867d7257ec2400877862ee20 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 11 Feb 2019 17:07:34 -0800 Subject: [PATCH 27/60] React to changes in .NET Core SDK --- src/Framework/src/SharedFx.targets | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Framework/src/SharedFx.targets b/src/Framework/src/SharedFx.targets index 7db7ca444edc..9d7002b4b0c0 100644 --- a/src/Framework/src/SharedFx.targets +++ b/src/Framework/src/SharedFx.targets @@ -199,12 +199,12 @@ This targets file should only be imported by .shfxproj files. - + - - - - + + + + From 6249f6334749d4704c8692695d272a394d6c75a8 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 11 Feb 2019 17:07:54 -0800 Subject: [PATCH 28/60] Commit changes to package.json --- .../clients/ts/signalr-protocol-msgpack/package-lock.json | 2 +- src/SignalR/clients/ts/signalr-protocol-msgpack/package.json | 2 +- src/SignalR/clients/ts/signalr/package-lock.json | 2 +- src/SignalR/clients/ts/signalr/package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SignalR/clients/ts/signalr-protocol-msgpack/package-lock.json b/src/SignalR/clients/ts/signalr-protocol-msgpack/package-lock.json index a8ca3e302a8a..2f45eb84a5d1 100644 --- a/src/SignalR/clients/ts/signalr-protocol-msgpack/package-lock.json +++ b/src/SignalR/clients/ts/signalr-protocol-msgpack/package-lock.json @@ -1,6 +1,6 @@ { "name": "@aspnet/signalr-protocol-msgpack", - "version": "3.0.0-preview-t000", + "version": "3.0.0-preview3-t000", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/src/SignalR/clients/ts/signalr-protocol-msgpack/package.json b/src/SignalR/clients/ts/signalr-protocol-msgpack/package.json index 6d2f625d16d0..30bf64403a02 100644 --- a/src/SignalR/clients/ts/signalr-protocol-msgpack/package.json +++ b/src/SignalR/clients/ts/signalr-protocol-msgpack/package.json @@ -1,6 +1,6 @@ { "name": "@aspnet/signalr-protocol-msgpack", - "version": "3.0.0-preview-t000", + "version": "3.0.0-preview3-t000", "description": "MsgPack Protocol support for ASP.NET Core SignalR", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.js", diff --git a/src/SignalR/clients/ts/signalr/package-lock.json b/src/SignalR/clients/ts/signalr/package-lock.json index 74adbdddd1a9..445ee3b840a2 100644 --- a/src/SignalR/clients/ts/signalr/package-lock.json +++ b/src/SignalR/clients/ts/signalr/package-lock.json @@ -1,6 +1,6 @@ { "name": "@aspnet/signalr", - "version": "3.0.0-preview-t000", + "version": "3.0.0-preview3-t000", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/src/SignalR/clients/ts/signalr/package.json b/src/SignalR/clients/ts/signalr/package.json index c18ff51d0b4b..cb2f600b2b57 100644 --- a/src/SignalR/clients/ts/signalr/package.json +++ b/src/SignalR/clients/ts/signalr/package.json @@ -1,6 +1,6 @@ { "name": "@aspnet/signalr", - "version": "3.0.0-preview-t000", + "version": "3.0.0-preview3-t000", "description": "ASP.NET Core SignalR Client", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.js", From e6a2466b0d822e436e8b8d622e491d787a16f367 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 11 Feb 2019 17:57:05 -0800 Subject: [PATCH 29/60] fixup! Commit changes to package.json --- src/Framework/src/SharedFx.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Framework/src/SharedFx.targets b/src/Framework/src/SharedFx.targets index 9d7002b4b0c0..53454f86bcaf 100644 --- a/src/Framework/src/SharedFx.targets +++ b/src/Framework/src/SharedFx.targets @@ -199,7 +199,7 @@ This targets file should only be imported by .shfxproj files. - + From 4d5bfe41fe9c6b29f1521fdd049afb06ba652423 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 11 Feb 2019 21:37:43 -0800 Subject: [PATCH 30/60] Fix broken tests on macOS/Linux --- src/MusicStore/samples/MusicStore/MusicStore.csproj | 2 +- .../IIS/IIS/test/testassets/TestTasks/TestTasks.csproj | 2 +- .../dotnet-user-secrets/src/Internal/ProjectIdResolver.cs | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/MusicStore/samples/MusicStore/MusicStore.csproj b/src/MusicStore/samples/MusicStore/MusicStore.csproj index d38938bba1e4..7310b2d2c73c 100644 --- a/src/MusicStore/samples/MusicStore/MusicStore.csproj +++ b/src/MusicStore/samples/MusicStore/MusicStore.csproj @@ -6,7 +6,7 @@ Music store application on ASP.NET Core netcoreapp3.0 $(DefineConstants);DEMO - win7-x86;win7-x64;linux-x64;osx-x64 + win-x86;win-x64;linux-x64;osx-x64 true diff --git a/src/Servers/IIS/IIS/test/testassets/TestTasks/TestTasks.csproj b/src/Servers/IIS/IIS/test/testassets/TestTasks/TestTasks.csproj index 91bdf2a6aee5..77237de91f87 100644 --- a/src/Servers/IIS/IIS/test/testassets/TestTasks/TestTasks.csproj +++ b/src/Servers/IIS/IIS/test/testassets/TestTasks/TestTasks.csproj @@ -3,7 +3,7 @@ Exe netcoreapp3.0 - win7-x64;win7-x86 + win-x64;win-x86;linux-x64;osx-x64 diff --git a/src/Tools/dotnet-user-secrets/src/Internal/ProjectIdResolver.cs b/src/Tools/dotnet-user-secrets/src/Internal/ProjectIdResolver.cs index da5111ca5157..b04cf8306d4f 100644 --- a/src/Tools/dotnet-user-secrets/src/Internal/ProjectIdResolver.cs +++ b/src/Tools/dotnet-user-secrets/src/Internal/ProjectIdResolver.cs @@ -72,6 +72,11 @@ public string Resolve(string project, string configuration) throw new InvalidOperationException(Resources.FormatError_ProjectFailedToLoad(projectFile)); } + if (!File.Exists(outputFile)) + { + throw new InvalidOperationException(Resources.FormatError_ProjectMissingId(projectFile)); + } + var id = File.ReadAllText(outputFile)?.Trim(); if (string.IsNullOrEmpty(id)) { From 71474a7466a22d1a7bc8707de1f43e1c256a6c0a Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 13 Feb 2019 13:25:24 -0800 Subject: [PATCH 31/60] React to renaming of VS2019 workloads --- eng/scripts/vs.json | 17 ++++++++--------- korebuild.json | 5 ++--- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/eng/scripts/vs.json b/eng/scripts/vs.json index 91c8701cf85c..b640fdda460e 100644 --- a/eng/scripts/vs.json +++ b/eng/scripts/vs.json @@ -6,22 +6,21 @@ "en-US" ], "add": [ - "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", - "Microsoft.Net.Component.4.7.2.TargetingPack", - "Microsoft.Net.Component.4.7.2.SDK", + "Microsoft.Net.Component.4.6.1.TargetingPack", + "Microsoft.Net.Component.4.6.2.TargetingPack", "Microsoft.Net.Component.4.7.1.TargetingPack", + "Microsoft.Net.Component.4.7.2.SDK", + "Microsoft.Net.Component.4.7.2.TargetingPack", "Microsoft.Net.Component.4.7.TargetingPack", - "Microsoft.Net.Component.4.6.2.TargetingPack", - "Microsoft.Net.Component.4.6.1.TargetingPack", "Microsoft.VisualStudio.Component.Azure.Storage.Emulator", "Microsoft.VisualStudio.Component.VC.ATL", - "Microsoft.VisualStudio.Component.VC.Tools.14.16", - "Microsoft.VisualStudio.Component.VC.v141", + "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", + "Microsoft.VisualStudio.Component.VC.v141.x86.x64", "Microsoft.VisualStudio.Component.Windows10SDK.17134", "Microsoft.VisualStudio.Workload.ManagedDesktop", - "Microsoft.VisualStudio.Workload.NetWeb", - "Microsoft.VisualStudio.Workload.NetCoreTools", "Microsoft.VisualStudio.Workload.NativeDesktop", + "Microsoft.VisualStudio.Workload.NetCoreTools", + "Microsoft.VisualStudio.Workload.NetWeb", "Microsoft.VisualStudio.Workload.VisualStudioExtension" ] } diff --git a/korebuild.json b/korebuild.json index 94430b176fae..b5db81778e73 100644 --- a/korebuild.json +++ b/korebuild.json @@ -15,12 +15,11 @@ "versionRange": "[16.0,17.0)", "requiredWorkloads": [ "Microsoft.VisualStudio.Component.VC.ATL", - "Microsoft.VisualStudio.Component.VC.Tools.14.16", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", - "Microsoft.VisualStudio.Component.VC.v141", + "Microsoft.VisualStudio.Component.VC.v141.x86.x64", "Microsoft.VisualStudio.Component.Windows10SDK.17134", "Microsoft.VisualStudio.Workload.VisualStudioExtension" ] } } -} \ No newline at end of file +} From 4bc88d93dafe84c34098dda0a22340fa093e1488 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 13 Feb 2019 13:26:53 -0800 Subject: [PATCH 32/60] Update min version to VS 2019 Preview 3 --- build/tasks/tasks.sln | 2 +- eng/tools/tools.sln | 2 +- korebuild.json | 2 +- src/Antiforgery/Antiforgery.sln | 2 +- src/Azure/Azure.sln | 2 +- .../src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.sln | 2 +- src/Components/Components.sln | 2 +- src/DataProtection/DataProtection.sln | 2 +- src/DefaultBuilder/DefaultBuilder.sln | 2 +- src/Hosting/Hosting.sln | 2 +- src/Http/HttpAbstractions.sln | 2 +- src/Identity/Identity.sln | 2 +- .../AspNetCoreModule-Setup/IIS-Setup/IIS-Common/Common.sln | 2 +- .../Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Setup.sln | 2 +- src/Installers/Windows/Installers.sln | 2 +- src/Middleware/Middleware.sln | 2 +- src/MusicStore/MusicStore.sln | 2 +- src/Mvc/Mvc.sln | 2 +- .../RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.sln | 2 +- src/Razor/Razor.sln | 2 +- src/Security/AuthSamples.sln | 2 +- src/Security/Security.sln | 2 +- src/Servers/FunctionalTests.sln | 2 +- src/Servers/HttpSys/HttpSysServer.sln | 2 +- src/Servers/IIS/IISIntegration.sln | 2 +- src/Servers/Kestrel.sln | 2 +- src/SignalR/SignalR.sln | 2 +- src/SignalR/clients/cpp/samples.sln | 2 +- src/SignalR/clients/cpp/signalrclient.sln | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/build/tasks/tasks.sln b/build/tasks/tasks.sln index 55921e71f948..b06704c699e3 100644 --- a/build/tasks/tasks.sln +++ b/build/tasks/tasks.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 -MinimumVisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.28608.199 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RepoTasks", "RepoTasks.csproj", "{A114791F-35B7-4E5B-8E5B-9A91E0B6E4AE}" EndProject Global diff --git a/eng/tools/tools.sln b/eng/tools/tools.sln index 51e337b7e318..1ef2bbc860bc 100644 --- a/eng/tools/tools.sln +++ b/eng/tools/tools.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 -MinimumVisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.28608.199 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BaselineGenerator", "BaselineGenerator\BaselineGenerator.csproj", "{CF76A947-3A72-4824-87E6-BF029D84218B}" EndProject Global diff --git a/korebuild.json b/korebuild.json index b5db81778e73..0a627716d480 100644 --- a/korebuild.json +++ b/korebuild.json @@ -12,7 +12,7 @@ "Windows" ], "includePrerelease": true, - "versionRange": "[16.0,17.0)", + "versionRange": "[16.0.28608.199, 17.0)", "requiredWorkloads": [ "Microsoft.VisualStudio.Component.VC.ATL", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", diff --git a/src/Antiforgery/Antiforgery.sln b/src/Antiforgery/Antiforgery.sln index d2b2db4eef13..fc64202e7f9e 100644 --- a/src/Antiforgery/Antiforgery.sln +++ b/src/Antiforgery/Antiforgery.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 -MinimumVisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.28608.199 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{71D070C4-B325-48F7-9F25-DD4E91C2BBCA}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{6EDD8B57-4DE8-4246-A6A3-47ECD92740B4}" diff --git a/src/Azure/Azure.sln b/src/Azure/Azure.sln index 4000d9554b2b..0189c1a3cf8e 100644 --- a/src/Azure/Azure.sln +++ b/src/Azure/Azure.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 -MinimumVisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.28608.199 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AzureAD", "AzureAD", "{B931802A-45BB-49A4-9919-B36C827100AC}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Authentication.AzureAD.UI", "Authentication.AzureAD.UI", "{312795E1-D5E2-4021-8FEA-342CA6F14CC8}" diff --git a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.sln b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.sln index 0d3c4529adc0..e25f102981fc 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.sln +++ b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 -MinimumVisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.28608.199 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorHosted-CSharp.Server", "BlazorHosted-CSharp.Server\BlazorHosted-CSharp.Server.csproj", "{650B3CE7-2E93-4CC4-9F46-466686815EAA}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorHosted-CSharp.Client", "BlazorHosted-CSharp.Client\BlazorHosted-CSharp.Client.csproj", "{5990939C-7E7B-4CFA-86FF-44CA5756498A}" diff --git a/src/Components/Components.sln b/src/Components/Components.sln index fc593a2117fc..e7fe841b2fdc 100644 --- a/src/Components/Components.sln +++ b/src/Components/Components.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.28509.92 -MinimumVisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.28608.199 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Analyzers", "Analyzers", "{E059A46B-56E3-41E2-83F4-B5D180056F3B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Analyzers", "Analyzers\src\Microsoft.AspNetCore.Components.Analyzers.csproj", "{ECE91401-329E-4615-8684-8E910D2741C4}" diff --git a/src/DataProtection/DataProtection.sln b/src/DataProtection/DataProtection.sln index 834c97a4fe7c..c2a33d97e2f9 100644 --- a/src/DataProtection/DataProtection.sln +++ b/src/DataProtection/DataProtection.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 -MinimumVisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.28608.199 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Abstractions", "Abstractions", "{ABD364B3-09A1-4CFE-8D26-FF6417DDEC84}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.DataProtection.Abstractions", "Abstractions\src\Microsoft.AspNetCore.DataProtection.Abstractions.csproj", "{18BE6FD1-1EB1-44AD-A3AE-398C990060F5}" diff --git a/src/DefaultBuilder/DefaultBuilder.sln b/src/DefaultBuilder/DefaultBuilder.sln index 92b547bbedce..d8096aecfd6b 100644 --- a/src/DefaultBuilder/DefaultBuilder.sln +++ b/src/DefaultBuilder/DefaultBuilder.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 -MinimumVisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.28608.199 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleApp", "samples\SampleApp\SampleApp.csproj", "{C19108F8-667B-4CF9-B227-CDD2290224BC}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Tests", "test\Microsoft.AspNetCore.Tests\Microsoft.AspNetCore.Tests.csproj", "{1CD49F15-D381-4C7E-8E12-A85E7753B110}" diff --git a/src/Hosting/Hosting.sln b/src/Hosting/Hosting.sln index 6b3d49631639..4574b901ef77 100644 --- a/src/Hosting/Hosting.sln +++ b/src/Hosting/Hosting.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 -MinimumVisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.28608.199 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting", "Hosting\src\Microsoft.AspNetCore.Hosting.csproj", "{254295FC-35AF-4A45-A6F4-FF93C1B7CD8D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.Tests", "Hosting\test\Microsoft.AspNetCore.Hosting.Tests.csproj", "{B2A631BD-744E-42FB-BA79-8F22BB27DA65}" diff --git a/src/Http/HttpAbstractions.sln b/src/Http/HttpAbstractions.sln index 762c87a0cb82..ee2deb20573b 100644 --- a/src/Http/HttpAbstractions.sln +++ b/src/Http/HttpAbstractions.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 -MinimumVisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.28608.199 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Authentication.Abstractions", "Authentication.Abstractions", "{587C3D55-6092-4B86-99F5-E9772C9C1ADB}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Abstractions", "Authentication.Abstractions\src\Microsoft.AspNetCore.Authentication.Abstractions.csproj", "{565B7B00-96A1-49B8-9753-9E045C6527A2}" diff --git a/src/Identity/Identity.sln b/src/Identity/Identity.sln index 9922b80cea9a..c7e2578ca19b 100644 --- a/src/Identity/Identity.sln +++ b/src/Identity/Identity.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 -MinimumVisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.28608.199 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2D5D4577-0E39-4B04-B66A-70259284B91B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiAuthSample", "ApiAuthorization.IdentityServer\samples\ApiAuthSample\ApiAuthSample.csproj", "{C2C3802C-5BA8-4BBB-8F16-BFC824739C95}" diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/Common.sln b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/Common.sln index 6cda623e6344..b3c0f651f7a1 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/Common.sln +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/Common.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 -MinimumVisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.28608.199 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLib", "lib\CommonLib.vcxproj", "{B54A8F61-60DE-4AD9-87CA-D102F230678E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reftrace", "reftrace\reftrace.vcxproj", "{A2599642-CBE5-4230-8511-3DC2D81874BE}" diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Setup.sln b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Setup.sln index 0b349bffd018..c5f3343b3952 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Setup.sln +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Setup.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 -MinimumVisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.28608.199 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iisca", "iisca\lib\iisca.vcxproj", "{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLib", "IIS-Common\lib\CommonLib.vcxproj", "{B54A8F61-60DE-4AD9-87CA-D102F230678E}" diff --git a/src/Installers/Windows/Installers.sln b/src/Installers/Windows/Installers.sln index 5d55dc1c136b..d5d02c7bb977 100644 --- a/src/Installers/Windows/Installers.sln +++ b/src/Installers/Windows/Installers.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 -MinimumVisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.28608.199 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aspnetcoreCA", "AspNetCoreModule-Setup\CustomAction\aspnetcoreCA.vcxproj", "{7C27E72F-54D0-4820-8CFA-5E4BE640974B}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iisca", "AspNetCoreModule-Setup\IIS-Setup\iisca\lib\iisca.vcxproj", "{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}" diff --git a/src/Middleware/Middleware.sln b/src/Middleware/Middleware.sln index ba4c1689905f..59aa4f649c47 100644 --- a/src/Middleware/Middleware.sln +++ b/src/Middleware/Middleware.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.28407.52 -MinimumVisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.28608.199 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebSockets", "WebSockets", "{E0D9867D-C23D-43EB-8D9C-DE0398A25432}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{A86EE055-ACD3-4BAC-A51D-1B3C71067AE0}" diff --git a/src/MusicStore/MusicStore.sln b/src/MusicStore/MusicStore.sln index cecb4b2e86f1..a46b09384dc6 100644 --- a/src/MusicStore/MusicStore.sln +++ b/src/MusicStore/MusicStore.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 -MinimumVisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.28608.199 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MusicStore", "samples\MusicStore\MusicStore.csproj", "{3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MusicStore.Test", "test\MusicStore.Test\MusicStore.Test.csproj", "{CA663205-77DE-4E55-B300-85594181B5A9}" diff --git a/src/Mvc/Mvc.sln b/src/Mvc/Mvc.sln index cdcc735ec39d..639544088994 100644 --- a/src/Mvc/Mvc.sln +++ b/src/Mvc/Mvc.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.28531.181 -MinimumVisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.28608.199 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{DAAE4C74-D06F-4874-A166-33305D2643CE}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{32285FA4-6B46-4D6B-A840-2B13E4C8B58E}" diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.sln b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.sln index 39d0af8d654e..05b062e8d07e 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.sln +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 -MinimumVisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.28608.199 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorComponentsWeb-CSharp.Server", "RazorComponentsWeb-CSharp.Server\RazorComponentsWeb-CSharp.Server.csproj", "{650B3CE7-2E93-4CC4-9F46-466686815EAA}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorComponentsWeb-CSharp.App", "RazorComponentsWeb-CSharp.App\RazorComponentsWeb-CSharp.App.csproj", "{5990939C-7E7B-4CFA-86FF-44CA5756498A}" diff --git a/src/Razor/Razor.sln b/src/Razor/Razor.sln index 351ffa7d14dc..861cd2e3c845 100644 --- a/src/Razor/Razor.sln +++ b/src/Razor/Razor.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 -MinimumVisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.28608.199 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F8C12DD6-659D-405A-AA27-FB22AD92A010}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig diff --git a/src/Security/AuthSamples.sln b/src/Security/AuthSamples.sln index 65b6acc184a2..f3df9552e670 100644 --- a/src/Security/AuthSamples.sln +++ b/src/Security/AuthSamples.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 -MinimumVisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.28608.199 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{CA4538F5-9DA8-4139-B891-A13279889F79}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{DA474CFD-7419-4747-A583-CCDC1FF71EB5}" diff --git a/src/Security/Security.sln b/src/Security/Security.sln index cf56b8509166..4a62c0ede391 100644 --- a/src/Security/Security.sln +++ b/src/Security/Security.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.28407.52 -MinimumVisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.28608.199 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Authorization", "Authorization", "{F6A3381D-978A-4CBF-BC72-862FB75CD6AF}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Authentication", "Authentication", "{79C549BA-2932-450A-B87D-635879361343}" diff --git a/src/Servers/FunctionalTests.sln b/src/Servers/FunctionalTests.sln index 4a503e5658cb..d8e444ee8f61 100644 --- a/src/Servers/FunctionalTests.sln +++ b/src/Servers/FunctionalTests.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 -MinimumVisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.28608.199 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerComparison.FunctionalTests", "test\FunctionalTests\ServerComparison.FunctionalTests.csproj", "{78018310-02F8-4BB8-A8E2-E88AF7A7F51E}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_dependencies", "_dependencies", "{25B4D0F2-96D1-4F34-896E-ABA1E803A230}" diff --git a/src/Servers/HttpSys/HttpSysServer.sln b/src/Servers/HttpSys/HttpSysServer.sln index 89ec1d421287..eacce1253437 100644 --- a/src/Servers/HttpSys/HttpSysServer.sln +++ b/src/Servers/HttpSys/HttpSysServer.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 -MinimumVisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.28608.199 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{99D5E5F3-88F5-4CCF-8D8C-717C8925DF09}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{E183C826-1360-4DFF-9994-F33CED5C8525}" diff --git a/src/Servers/IIS/IISIntegration.sln b/src/Servers/IIS/IISIntegration.sln index 80c0ea5229d5..54e3681013c0 100644 --- a/src/Servers/IIS/IISIntegration.sln +++ b/src/Servers/IIS/IISIntegration.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 -MinimumVisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.28608.199 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0EF45656-B25D-40D8-959C-726EAF185E60}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig diff --git a/src/Servers/Kestrel.sln b/src/Servers/Kestrel.sln index e434f397f3df..8276ae5711da 100644 --- a/src/Servers/Kestrel.sln +++ b/src/Servers/Kestrel.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 -MinimumVisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.28608.199 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Connections.Abstractions", "Connections.Abstractions\src\Microsoft.AspNetCore.Connections.Abstractions.csproj", "{710E0641-FFF4-4994-A7FA-B22A550A8F20}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Core", "Kestrel\Core\src\Microsoft.AspNetCore.Server.Kestrel.Core.csproj", "{5F6D1661-652E-4DF3-8A81-6EBE4208CE1A}" diff --git a/src/SignalR/SignalR.sln b/src/SignalR/SignalR.sln index d240cbecd5ba..92a5ab941424 100644 --- a/src/SignalR/SignalR.sln +++ b/src/SignalR/SignalR.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.28315.86 -MinimumVisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.28608.199 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{C4BC9889-B49F-41B6-806B-F84941B2549B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SignalRSamples", "samples\SignalRSamples\SignalRSamples.csproj", "{C4AEAB04-F341-4539-B6C0-52368FB4BF9E}" diff --git a/src/SignalR/clients/cpp/samples.sln b/src/SignalR/clients/cpp/samples.sln index b152ac18a876..728345be1b30 100644 --- a/src/SignalR/clients/cpp/samples.sln +++ b/src/SignalR/clients/cpp/samples.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 VisualStudioVersion = 16.0.0.0 -MinimumVisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.28608.199 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PersistentConnectionSample", "samples\PersistentConnectionSample\PersistentConnectionSample.vcxproj", "{BD075706-11E9-403B-A2E3-A5E1397E53EF}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HubConnectionSample", "samples\HubConnectionSample\HubConnectionSample.vcxproj", "{3C9BD092-18E6-4C6E-A887-CDFC80ACB206}" diff --git a/src/SignalR/clients/cpp/signalrclient.sln b/src/SignalR/clients/cpp/signalrclient.sln index 06a00bf2b76d..5d78086fb4b4 100644 --- a/src/SignalR/clients/cpp/signalrclient.sln +++ b/src/SignalR/clients/cpp/signalrclient.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 -MinimumVisualStudioVersion = 16.0.0.0 +MinimumVisualStudioVersion = 16.0.28608.199 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "signalrclient", "src\signalrclient\Build\VS\signalrclient.vcxproj", "{87ED3AD4-D820-48CD-8382-A12564213A12}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "signalrclienttests", "test\signalrclienttests\Build\VS\signalrclienttests.vcxproj", "{10376148-BCF4-4B55-98A5-3C98C87FD898}" From 1573b7a4bbbb9588b7977b56342fe2bc765ec845 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 13 Feb 2019 13:32:31 -0800 Subject: [PATCH 33/60] Remove usage of VCToolsRedistVersion --- src/Servers/IIS/build/Build.Settings | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Servers/IIS/build/Build.Settings b/src/Servers/IIS/build/Build.Settings index e68136bb2b10..ce1d870e75c1 100644 --- a/src/Servers/IIS/build/Build.Settings +++ b/src/Servers/IIS/build/Build.Settings @@ -20,8 +20,6 @@ true ..\DefaultRules.ruleset false - - true $(RunCodeAnalysis) From 4e401e8818c465c9dd805110f6c038108ce19e5b Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 13 Feb 2019 14:14:29 -0800 Subject: [PATCH 34/60] Add atl to required workloads --- eng/scripts/vs.json | 1 + korebuild.json | 1 + 2 files changed, 2 insertions(+) diff --git a/eng/scripts/vs.json b/eng/scripts/vs.json index b640fdda460e..cc54ea916d3c 100644 --- a/eng/scripts/vs.json +++ b/eng/scripts/vs.json @@ -15,6 +15,7 @@ "Microsoft.VisualStudio.Component.Azure.Storage.Emulator", "Microsoft.VisualStudio.Component.VC.ATL", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", + "Microsoft.VisualStudio.Component.VC.v141.ATL", "Microsoft.VisualStudio.Component.VC.v141.x86.x64", "Microsoft.VisualStudio.Component.Windows10SDK.17134", "Microsoft.VisualStudio.Workload.ManagedDesktop", diff --git a/korebuild.json b/korebuild.json index 0a627716d480..a2caa566a9ca 100644 --- a/korebuild.json +++ b/korebuild.json @@ -16,6 +16,7 @@ "requiredWorkloads": [ "Microsoft.VisualStudio.Component.VC.ATL", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", + "Microsoft.VisualStudio.Component.VC.v141.ATL", "Microsoft.VisualStudio.Component.VC.v141.x86.x64", "Microsoft.VisualStudio.Component.Windows10SDK.17134", "Microsoft.VisualStudio.Workload.VisualStudioExtension" From c847befc32e03fce41bcfd98947a4c40b54a4109 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 13 Feb 2019 18:36:00 -0800 Subject: [PATCH 35/60] Workaround Microsoft/msbuild#4150 and issue in C++ tooling --- Directory.Build.props | 1 + build.ps1 | 5 ++++- build.sh | 2 +- build/repo.targets | 2 -- eng/Workarounds.props | 20 ++++++++++++++++++++ eng/targets/Wix.Common.props | 2 +- 6 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 eng/Workarounds.props diff --git a/Directory.Build.props b/Directory.Build.props index ef670c06ead0..d05faeb4ec9a 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -171,6 +171,7 @@ true + diff --git a/build.ps1 b/build.ps1 index 859ae10cfec5..b276a647cc5f 100644 --- a/build.ps1 +++ b/build.ps1 @@ -285,7 +285,10 @@ $RunRestore = if ($NoRestore) { $false } else { $true } # Target selection -$MSBuildArguments += "/p:_RunRestore=$RunRestore" +if ($RunRestore) { + $MSBuildArguments += "/restore" +} + $MSBuildArguments += "/p:_RunBuild=$RunBuild" $MSBuildArguments += "/p:_RunPack=$Pack" $MSBuildArguments += "/p:_RunTests=$Test" diff --git a/build.sh b/build.sh index 4499355155d0..51d8446dce91 100755 --- a/build.sh +++ b/build.sh @@ -304,7 +304,7 @@ fi [ ! -z "$build_nodejs" ] && msbuild_args[${#msbuild_args[*]}]="-p:BuildNodeJS=$build_nodejs" [ ! -z "$build_managed" ] && msbuild_args[${#msbuild_args[*]}]="-p:BuildManaged=$build_managed" -msbuild_args[${#msbuild_args[*]}]="-p:_RunRestore=$run_restore" +[ "$run_restore" = true ] && msbuild_args[${#msbuild_args[*]}]="-restore" msbuild_args[${#msbuild_args[*]}]="-p:_RunBuild=$run_build" msbuild_args[${#msbuild_args[*]}]="-p:_RunPack=$run_pack" msbuild_args[${#msbuild_args[*]}]="-p:_RunTests=$run_tests" diff --git a/build/repo.targets b/build/repo.targets index ba8999ae131c..7b1b94c25e64 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -10,7 +10,6 @@ Prepare - $(BuildDependsOn);Restore $(BuildDependsOn);Compile $(BuildDependsOn);Package $(BuildDependsOn);Test;Verify @@ -22,7 +21,6 @@ $(RestoreDependsOn);InstallDotNet;RestoreProjects - Restore $(CompileDependsOn);BuildProjects $(PackageDependsOn);PackProjects diff --git a/eng/Workarounds.props b/eng/Workarounds.props new file mode 100644 index 000000000000..882180e93f4e --- /dev/null +++ b/eng/Workarounds.props @@ -0,0 +1,20 @@ + + + + + + $(BaseIntermediateOutputPath) + $(MSBuildProjectDir)\obj\ + + + + + <_ProjectExtensionsWereImported>true + $(WixInstallPath)\wix2010.targets + + + + + 14.16.27023 + + diff --git a/eng/targets/Wix.Common.props b/eng/targets/Wix.Common.props index a6d4d1453984..e6b1337fcba0 100644 --- a/eng/targets/Wix.Common.props +++ b/eng/targets/Wix.Common.props @@ -17,7 +17,7 @@ $(MSBuildToolsPath)\NuGet.targets - + From 9ee9ec03e4aff52275af22ab8bfb23838ef0e9bb Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 13 Feb 2019 19:44:09 -0800 Subject: [PATCH 36/60] Add --no-restore flags during CI build --- .azure/pipelines/ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 07560f2846ce..64d1890fe31b 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -58,7 +58,7 @@ jobs: # Build the x86 shared framework # Set DisableSignCheck because we'll run sign check in an explicit step after installers build - - script: ./eng/scripts/cibuild.cmd -arch x86 /t:BuildSharedFx /p:DisableCodeSigning=true + - script: ./eng/scripts/cibuild.cmd -arch x86 -NoRestore /t:BuildSharedFx /p:DisableCodeSigning=true displayName: Build x86 # This is in a separate build step with -forceCoreMsbuild to workaround MAX_PATH limitations - https://github.com/Microsoft/msbuild/issues/53 @@ -68,7 +68,7 @@ jobs: # This runs code-signing on all packages, zips, and jar files as defined in build/CodeSign.targets. If https://github.com/dotnet/arcade/issues/1957 is resolved, # consider running code-signing inline with the other previous steps. # Sign check is disabled because it is run in a separate step below, after installers are built. - - script: ./build.cmd -ci -sign /t:CodeSign /p:SignType=$(_SignType) /p:DisableSignCheck=true + - script: ./build.cmd -ci -sign -NoRestore /t:CodeSign /p:SignType=$(_SignType) /p:DisableSignCheck=true displayName: Code sign packages # Windows installers bundle both x86 and x64 assets @@ -76,7 +76,7 @@ jobs: displayName: Build Installers # Run sign check to verify everything was code signed. - - script: ./build.cmd -ci -sign /t:SignCheck /p:SignType=$(_SignType) + - script: ./build.cmd -ci -sign -NoRestore /t:SignCheck /p:SignType=$(_SignType) displayName: Run sign check condition: eq(variables['_SignType'], 'real') @@ -168,6 +168,7 @@ jobs: --ci --pack --all --no-build-nodejs --no-build-java \ --arch x64 \ -e KOREBUILD_SKIP_INSTALL_NETFX=0 \ + --no-restore \ /t:BuildSharedFx \ /p:BuildRuntimeArchive=false \ /p:LinuxInstallerType=deb From cc85bc409ff32211e3b57ef494173d617e49906a Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 14 Feb 2019 22:43:30 -0800 Subject: [PATCH 37/60] Update ci.yml --- .azure/pipelines/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index a0377c56ee6a..8c3f10df68b3 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -25,7 +25,7 @@ jobs: workspace: clean: all pool: - name: dotnet-external-temp-vs2019 + name: dotnet-external-temp-vs2019-preview steps: - powershell: ./eng/scripts/CodeCheck.ps1 -ci displayName: Run eng/scripts/CodeCheck.ps1 @@ -37,8 +37,6 @@ jobs: jobName: Windows_build jobDisplayName: "Build: Windows x64/x86" agentOs: Windows - # Temporary - try the staging pool - poolName: dotnet-external-temp-staging buildSteps: - script: "echo ##vso[build.addbuildtag]daily-build" condition: and(ne(variables['Build.Reason'], 'PullRequest'), ne(variables['IsFinalBuild'], 'true')) From c84f6b3d384b308c34be4f6f6082d423e9aa9cd3 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 14 Feb 2019 22:44:02 -0800 Subject: [PATCH 38/60] Update default-build.yml --- .azure/pipelines/jobs/default-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index 19aacd9699d1..02296462d76e 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -91,9 +91,9 @@ jobs: name: ${{ parameters.poolName }} ${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Windows')) }}: ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: dotnet-internal-temp-vs2019 + name: dotnet-internal-temp-vs2019-preview ${{ if ne(variables['System.TeamProject'], 'internal') }}: - name: dotnet-external-temp-vs2019 + name: dotnet-external-temp-vs2019-preview variables: AgentOsName: ${{ parameters.agentOs }} ASPNETCORE_TEST_LOG_MAXPATH: "200" # Keep test log file name length low enough for artifact zipping From 610a113864e90f7637a738ea1a9216b0055aef6f Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 14 Feb 2019 22:46:29 -0800 Subject: [PATCH 39/60] Update ci.yml --- .azure/pipelines/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 8c3f10df68b3..de62cf57e35a 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -25,7 +25,7 @@ jobs: workspace: clean: all pool: - name: dotnet-external-temp-vs2019-preview + name: dotnet-external-vs2019-preview steps: - powershell: ./eng/scripts/CodeCheck.ps1 -ci displayName: Run eng/scripts/CodeCheck.ps1 From d0b7260243534217a7e07bde604eb9738e409fb1 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 14 Feb 2019 22:46:50 -0800 Subject: [PATCH 40/60] Update default-build.yml --- .azure/pipelines/jobs/default-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index 02296462d76e..85b831b993c3 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -91,9 +91,9 @@ jobs: name: ${{ parameters.poolName }} ${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Windows')) }}: ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: dotnet-internal-temp-vs2019-preview + name: dotnet-internal-vs2019-preview ${{ if ne(variables['System.TeamProject'], 'internal') }}: - name: dotnet-external-temp-vs2019-preview + name: dotnet-external-vs2019-preview variables: AgentOsName: ${{ parameters.agentOs }} ASPNETCORE_TEST_LOG_MAXPATH: "200" # Keep test log file name length low enough for artifact zipping From 71d992d861a964acfebbda00f7744f9ff467b7dc Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 14 Feb 2019 22:52:21 -0800 Subject: [PATCH 41/60] Update CodeCheck.ps1 --- eng/scripts/CodeCheck.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/scripts/CodeCheck.ps1 b/eng/scripts/CodeCheck.ps1 index 7ccf9a3bac67..939f86a2d00c 100644 --- a/eng/scripts/CodeCheck.ps1 +++ b/eng/scripts/CodeCheck.ps1 @@ -26,7 +26,7 @@ try { # if ($ci) { - & $repoRoot/build.ps1 -ci /t:InstallDotNet + & $repoRoot/build.ps1 -ci -norestore /t:InstallDotNet } Write-Host "Checking that Versions.props and Version.Details.xml match" From a76465b5061ceb695d2ee8e25d6f11a7195cd0a8 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 14 Feb 2019 22:53:42 -0800 Subject: [PATCH 42/60] Update helix-test.yml --- .azure/pipelines/helix-test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.azure/pipelines/helix-test.yml b/.azure/pipelines/helix-test.yml index 2bd5284917f8..14004db13bd0 100644 --- a/.azure/pipelines/helix-test.yml +++ b/.azure/pipelines/helix-test.yml @@ -11,8 +11,7 @@ jobs: - job: Helix timeoutInMinutes: 240 pool: - name: Hosted VS2017 - vmImage: vs2017-win2016 + name: dotnet-external-vs2019-preview steps: - checkout: self clean: true From 5b82b2f7ba90ac24fee8e32dd62a98f98573a11e Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 15 Feb 2019 08:44:10 -0800 Subject: [PATCH 43/60] Update build definitions --- .azure/pipelines/ci.yml | 49 ++++++------------------- .azure/pipelines/helix-test.yml | 30 +++++++-------- .azure/pipelines/jobs/default-build.yml | 13 ++++--- eng/scripts/CodeCheck.ps1 | 4 ++ eng/scripts/GenerateProjectList.ps1 | 2 +- 5 files changed, 37 insertions(+), 61 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index de62cf57e35a..5fb7fd8f76cb 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -20,15 +20,14 @@ pr: - '*' jobs: -- job: Code_check - displayName: Code check - workspace: - clean: all - pool: - name: dotnet-external-vs2019-preview - steps: - - powershell: ./eng/scripts/CodeCheck.ps1 -ci - displayName: Run eng/scripts/CodeCheck.ps1 +- template: jobs/default-build.yml + parameters: + jobName: Code_check + jobDisplayName: Code check + agentOs: Windows + steps: + - powershell: ./eng/scripts/CodeCheck.ps1 -ci + displayName: Run eng/scripts/CodeCheck.ps1 # Build Windows (x64/x86) - template: jobs/default-build.yml @@ -37,7 +36,7 @@ jobs: jobName: Windows_build jobDisplayName: "Build: Windows x64/x86" agentOs: Windows - buildSteps: + steps: - script: "echo ##vso[build.addbuildtag]daily-build" condition: and(ne(variables['Build.Reason'], 'PullRequest'), ne(variables['IsFinalBuild'], 'true')) displayName: 'Set CI tags' @@ -102,8 +101,8 @@ jobs: jobName: Windows_arm_build jobDisplayName: "Build: Windows ARM" agentOs: Windows - buildScript: ./eng/scripts/cibuild.cmd -NoBuildNodeJS -NoBuildJava - buildArgs: -arch arm /p:SignType=$(_SignType) + buildScript: ./eng/scripts/cibuild.cmd + buildArgs: -arch arm -NoBuildNodeJS -NoBuildJava /p:SignType=$(_SignType) installNodeJs: false installJdk: false afterBuild: @@ -156,7 +155,7 @@ jobs: jobDisplayName: "Build: Linux x64" agentOs: Linux installNodeJs: false - buildSteps: + steps: - script: ./eng/scripts/cibuild.sh --arch x64 --no-build-nodejs --no-build-java displayName: Run cibuild.sh - script: | @@ -331,27 +330,3 @@ jobs: - name: Linux_Test_Logs path: artifacts/logs/ publishOnError: true - -# Disabled due to unmet machine requirements in the VS2019 machine pool. -# See https://github.com/aspnet/AspNetCore-Internal/issues/1764 -# -# - template: jobs/iisintegration-job.yml -# parameters: -# condition: ne(variables['SkipTests'], 'true') -# TestGroupName: IIS -# skipArgs: " /p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISTests=false /p:SkipIISExpressTests=true /p:SkipIISForwardsCompatibilityTests=true" -# - template: jobs/iisintegration-job.yml -# parameters: -# condition: ne(variables['SkipTests'], 'true') -# TestGroupName: IISExpress -# skipArgs: "/p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISTests=true /p:SkipIISExpressTests=false /p:SkipIISForwardsCompatibilityTests=true" -# - template: jobs/iisintegration-job.yml -# parameters: -# condition: ne(variables['SkipTests'], 'true') -# TestGroupName: IISForwardCompat -# skipArgs: "/p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISForwardsCompatibilityTests=false" -# - template: jobs/iisintegration-job.yml -# parameters: -# condition: ne(variables['SkipTests'], 'true') -# TestGroupName: IISBackCompat -# skipArgs: "/p:SkipIISBackwardsCompatibilityTests=false /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISForwardsCompatibilityTests=true" diff --git a/.azure/pipelines/helix-test.yml b/.azure/pipelines/helix-test.yml index 14004db13bd0..b3173e456bf6 100644 --- a/.azure/pipelines/helix-test.yml +++ b/.azure/pipelines/helix-test.yml @@ -8,20 +8,16 @@ pr: - '*' jobs: -- job: Helix - timeoutInMinutes: 240 - pool: - name: dotnet-external-vs2019-preview - steps: - - checkout: self - clean: true - - script: .\build.cmd -all -ci /t:Helix /p:IsHelixJob=true /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\SendToHelix.binlog - displayName: Run build.cmd helix target - - task: PublishBuildArtifacts@1 - displayName: Publish Logs to VSTS - inputs: - PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log' - PublishLocation: Container - ArtifactName: $(Agent.Os)_$(Agent.JobName) - continueOnError: true - condition: always() +- template: jobs/default-build.yml + parameters: + jobName: Helix + jobDisplayName: 'Tests: Helix' + agentOs: Windows + timeoutInMinutes: 240 + steps: + - script: .\build.cmd -all -ci /t:Helix /p:IsHelixJob=true /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\logs\SendToHelix.binlog + displayName: Run build.cmd helix target + artifacts: + - name: Helix_logs + path: artifacts/logs/ + publishOnError: true diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index 85b831b993c3..06fff26d1a25 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -14,7 +14,7 @@ # Note: -ci is always passed # beforeBuild: [steps] # Additional steps to run before build.sh/cmd -# buildSteps: [steps] +# steps: [steps] # Instead of running build.cmd/sh, run these build steps. # afterBuild: [steps] # Additional steps to run after build.sh/cmd @@ -50,7 +50,7 @@ parameters: buildArgs: '' configuration: 'Release' beforeBuild: [] - # buildSteps: [] don't define an empty object default because there is no way in template expression yet to check "if isEmpty(parameters.buildSteps)" + # steps: [] don't define an empty object default because there is no way in template expression yet to check "if isEmpty(parameters.steps)" afterBuild: [] codeSign: false variables: {} @@ -64,6 +64,7 @@ parameters: buildScript: '' installNodeJs: true installJdk: true + timeoutInMinutes: 120 jobs: - job: ${{ coalesce(parameters.jobName, parameters.agentOs) }} @@ -71,7 +72,7 @@ jobs: dependsOn: ${{ parameters.dependsOn }} ${{ if ne(parameters.condition, '') }}: condition: ${{ parameters.condition }} - timeoutInMinutes: 120 + timeoutInMinutes: ${{ parameters.timeoutInMinutes }} workspace: clean: all strategy: @@ -132,9 +133,9 @@ jobs: - ${{ parameters.beforeBuild }} - - ${{ if ne(parameters.buildSteps, '')}}: - - ${{ parameters.buildSteps }} - - ${{ if eq(parameters.buildSteps, '')}}: + - ${{ if ne(parameters.steps, '')}}: + - ${{ parameters.steps }} + - ${{ if eq(parameters.steps, '')}}: - ${{ if eq(parameters.buildScript, '') }}: - ${{ if eq(parameters.agentOs, 'Windows') }}: - script: .\$(BuildDirectory)\build.cmd -ci /p:SignType=$(_SignType) /p:Configuration=$(BuildConfiguration) $(BuildScriptArgs) diff --git a/eng/scripts/CodeCheck.ps1 b/eng/scripts/CodeCheck.ps1 index 939f86a2d00c..f027ca2912aa 100644 --- a/eng/scripts/CodeCheck.ps1 +++ b/eng/scripts/CodeCheck.ps1 @@ -16,6 +16,9 @@ $repoRoot = Resolve-Path "$PSScriptRoot/../.." [string[]] $errors = @() function LogError([string]$message) { + if ($env:TF_BUILD) { + Write-Host "##vso[task.logissue type=error]$message" + } Write-Host -f Red "error: $message" $script:errors += $message } @@ -27,6 +30,7 @@ try { if ($ci) { & $repoRoot/build.ps1 -ci -norestore /t:InstallDotNet + . "$repoRoot/activate.ps1" } Write-Host "Checking that Versions.props and Version.Details.xml match" diff --git a/eng/scripts/GenerateProjectList.ps1 b/eng/scripts/GenerateProjectList.ps1 index 53cbe5813843..adee357de409 100644 --- a/eng/scripts/GenerateProjectList.ps1 +++ b/eng/scripts/GenerateProjectList.ps1 @@ -5,4 +5,4 @@ $ErrorActionPreference = 'stop' $repoRoot = Resolve-Path "$PSScriptRoot/../.." -& "$repoRoot\build.ps1" -ci:$ci -all /t:GenerateProjectList +& "$repoRoot\build.ps1" -ci:$ci -NoRestore -all /t:GenerateProjectList From d37329cac47ee8c17929865a81bab8af516fe339 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 15 Feb 2019 10:31:13 -0800 Subject: [PATCH 44/60] Fix `--no-restore` in build.sh --- build.sh | 8 ++++++-- eng/scripts/CodeCheck.ps1 | 1 - 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index fa42814f09d2..247094dfea40 100755 --- a/build.sh +++ b/build.sh @@ -20,7 +20,7 @@ channel='master' tools_source='https://aspnetcore.blob.core.windows.net/buildtools' target_os_name='' ci=false -run_restore=true +run_restore='' run_build=true run_pack=false run_tests=false @@ -190,7 +190,7 @@ while [[ $# -gt 0 ]]; do --no-build) run_build=false # --no-build implies --no-restore - run_restore=false + [ -z "$run_restore" ] && run_restore=false ;; --no-build-deps) build_deps=false @@ -313,6 +313,9 @@ fi [ ! -z "$build_nodejs" ] && msbuild_args[${#msbuild_args[*]}]="-p:BuildNodeJS=$build_nodejs" [ ! -z "$build_managed" ] && msbuild_args[${#msbuild_args[*]}]="-p:BuildManaged=$build_managed" +# Run restore by default unless --no-restore or --no-build was specified. +[ -z "$run_restore" ] && run_restore=true + [ "$run_restore" = true ] && msbuild_args[${#msbuild_args[*]}]="-restore" msbuild_args[${#msbuild_args[*]}]="-p:_RunBuild=$run_build" msbuild_args[${#msbuild_args[*]}]="-p:_RunPack=$run_pack" @@ -324,6 +327,7 @@ msbuild_args[${#msbuild_args[*]}]="-p:TargetOsName=$target_os_name" # Disable downloading ref assemblies as a tarball. Use netfx refs from the Microsoft.NETFramework.ReferenceAssemblies NuGet package instead. [ -z "${KOREBUILD_SKIP_INSTALL_NETFX:-}" ] && KOREBUILD_SKIP_INSTALL_NETFX=1 +export KOREBUILD_KEEPGLOBALJSON=1 set_korebuildsettings "$tools_source" "$DOTNET_HOME" "$DIR" "$config_file" "$ci" # This incantation avoids unbound variable issues if msbuild_args is empty diff --git a/eng/scripts/CodeCheck.ps1 b/eng/scripts/CodeCheck.ps1 index f027ca2912aa..f65c8871d0a8 100644 --- a/eng/scripts/CodeCheck.ps1 +++ b/eng/scripts/CodeCheck.ps1 @@ -30,7 +30,6 @@ try { if ($ci) { & $repoRoot/build.ps1 -ci -norestore /t:InstallDotNet - . "$repoRoot/activate.ps1" } Write-Host "Checking that Versions.props and Version.Details.xml match" From 19ba9379db66f059dd92b1eeccb07c18e40f1be6 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 15 Feb 2019 11:28:00 -0800 Subject: [PATCH 45/60] Attempt to workaround CodeCheck.ps1 failure which doesn't repro locally or on different agents. Possibly due to differences in the version of the PowerShell task? --- .azure/pipelines/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 5fb7fd8f76cb..63c7f4399af7 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -28,6 +28,7 @@ jobs: steps: - powershell: ./eng/scripts/CodeCheck.ps1 -ci displayName: Run eng/scripts/CodeCheck.ps1 + failOnStderr: false # Build Windows (x64/x86) - template: jobs/default-build.yml From 40dd8488e369ae0083b94658a98c7b9057c30432 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 15 Feb 2019 14:40:30 -0800 Subject: [PATCH 46/60] Use git diff --name-only to figure out _which_ files are failing code check --- .azure/pipelines/ci.yml | 1 - eng/scripts/CodeCheck.ps1 | 31 ++++++++++++++++++++++--------- korebuild.json | 2 +- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 63c7f4399af7..5fb7fd8f76cb 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -28,7 +28,6 @@ jobs: steps: - powershell: ./eng/scripts/CodeCheck.ps1 -ci displayName: Run eng/scripts/CodeCheck.ps1 - failOnStderr: false # Build Windows (x64/x86) - template: jobs/default-build.yml diff --git a/eng/scripts/CodeCheck.ps1 b/eng/scripts/CodeCheck.ps1 index f65c8871d0a8..93dd752e860a 100644 --- a/eng/scripts/CodeCheck.ps1 +++ b/eng/scripts/CodeCheck.ps1 @@ -15,9 +15,18 @@ $repoRoot = Resolve-Path "$PSScriptRoot/../.." [string[]] $errors = @() -function LogError([string]$message) { +function LogError { + param( + [Parameter(Mandatory = $true, Position = 0)] + [string]$message, + [string]$FilePath + ) if ($env:TF_BUILD) { - Write-Host "##vso[task.logissue type=error]$message" + $prefix = "##vso[task.logissue type=error" + if ($FilePath) { + $prefix = "${prefix};sourcepath=$FilePath" + } + Write-Host "${prefix}]${message}" } Write-Host -f Red "error: $message" $script:errors += $message @@ -50,7 +59,9 @@ try { $actualVersion = $versionVar.InnerText if ($expectedVersion -ne $actualVersion) { - LogError "Version variable '$varName' does not match the value in Version.Details.xml. Expected '$expectedVersion', actual '$actualVersion'" + LogError ` + "Version variable '$varName' does not match the value in Version.Details.xml. Expected '$expectedVersion', actual '$actualVersion'" ` + -filepath "$repoRoot\eng\Versions.props" } } @@ -95,12 +106,14 @@ try { & $dotnet run -p "$repoRoot/eng/tools/BaselineGenerator/" } - Write-Host "git diff" - & git diff --ignore-space-at-eol --exit-code - if ($LastExitCode -ne 0) { - $status = git status -s | Out-String - $status = $status -replace "`n","`n " - LogError "Generated code is not up to date." + Write-Host "Run git diff to check for pending changes" + $changedFiles = git --no-pager diff --ignore-space-at-eol --name-only + if ($changedFiles) { + foreach ($file in $changedFiles) { + $filePath = Resolve-Path "${repoRoot}/${file}" + LogError "Generated code is not up to date in $file." -filepath $filePath + & git --no-pager diff --ignore-space-at-eol $filePath + } } } finally { diff --git a/korebuild.json b/korebuild.json index a2caa566a9ca..34ab616652e0 100644 --- a/korebuild.json +++ b/korebuild.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json", - "channel": "feature/vs2019", + "channel": "master", "msbuildType": "full", "toolsets": { "nodejs": { From 35ef92e87857fadd40c941a91ffe9db75c8e65a6 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 15 Feb 2019 16:49:08 -0800 Subject: [PATCH 47/60] Download git during codecheck --- eng/scripts/CodeCheck.ps1 | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/eng/scripts/CodeCheck.ps1 b/eng/scripts/CodeCheck.ps1 index 93dd752e860a..5e3cdd417153 100644 --- a/eng/scripts/CodeCheck.ps1 +++ b/eng/scripts/CodeCheck.ps1 @@ -33,12 +33,19 @@ function LogError { } try { - # - # Solutions - # - if ($ci) { & $repoRoot/build.ps1 -ci -norestore /t:InstallDotNet + + $git = Get-Command git -ea ignore + if (-not $git) { + Write-Host "Could not find git.exe - downloading git v2.20.1" + $tempDir = "$PSScriptRoot/obj/" + mkdir $tempDir -ea ignore | out-null + $ProgressPreference = 'SilentlyContinue' # Workaround PowerShell/PowerShell#2138 + Invoke-WebRequest -UseBasicParsing 'https://github.com/git-for-windows/git/releases/download/v2.20.1.windows.1/MinGit-2.20.1-64-bit.zip' -o $tempDir/git.zip + Expand-Archive $tempDir/git.zip -d $tempDir/git/ + $env:PATH="$env:PATH;$tempDir/git/cmd/" + } } Write-Host "Checking that Versions.props and Version.Details.xml match" From 31e6baa317821ba81c9977944961afac7bb6bc6c Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 15 Feb 2019 16:58:09 -0800 Subject: [PATCH 48/60] Revert "Download git during codecheck" This reverts commit 35ef92e87857fadd40c941a91ffe9db75c8e65a6. --- eng/scripts/CodeCheck.ps1 | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/eng/scripts/CodeCheck.ps1 b/eng/scripts/CodeCheck.ps1 index 5e3cdd417153..93dd752e860a 100644 --- a/eng/scripts/CodeCheck.ps1 +++ b/eng/scripts/CodeCheck.ps1 @@ -33,19 +33,12 @@ function LogError { } try { + # + # Solutions + # + if ($ci) { & $repoRoot/build.ps1 -ci -norestore /t:InstallDotNet - - $git = Get-Command git -ea ignore - if (-not $git) { - Write-Host "Could not find git.exe - downloading git v2.20.1" - $tempDir = "$PSScriptRoot/obj/" - mkdir $tempDir -ea ignore | out-null - $ProgressPreference = 'SilentlyContinue' # Workaround PowerShell/PowerShell#2138 - Invoke-WebRequest -UseBasicParsing 'https://github.com/git-for-windows/git/releases/download/v2.20.1.windows.1/MinGit-2.20.1-64-bit.zip' -o $tempDir/git.zip - Expand-Archive $tempDir/git.zip -d $tempDir/git/ - $env:PATH="$env:PATH;$tempDir/git/cmd/" - } } Write-Host "Checking that Versions.props and Version.Details.xml match" From 2ab0890508db0d2954716206f92988d3a7c5c5e6 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 15 Feb 2019 16:58:56 -0800 Subject: [PATCH 49/60] Debug git version --- .azure/pipelines/ci.yml | 2 ++ eng/scripts/CodeCheck.ps1 | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 5fb7fd8f76cb..707563c7c187 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -25,6 +25,8 @@ jobs: jobName: Code_check jobDisplayName: Code check agentOs: Windows + installJdk: false + installNodeJs: false steps: - powershell: ./eng/scripts/CodeCheck.ps1 -ci displayName: Run eng/scripts/CodeCheck.ps1 diff --git a/eng/scripts/CodeCheck.ps1 b/eng/scripts/CodeCheck.ps1 index 93dd752e860a..eab6352acaf0 100644 --- a/eng/scripts/CodeCheck.ps1 +++ b/eng/scripts/CodeCheck.ps1 @@ -33,9 +33,7 @@ function LogError { } try { - # - # Solutions - # + Invoke-Block { & git --version } if ($ci) { & $repoRoot/build.ps1 -ci -norestore /t:InstallDotNet From 55ba4d198ba5b941b24791888db29e27f5519e4f Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 15 Feb 2019 18:18:50 -0800 Subject: [PATCH 50/60] Emit PSVersion table --- eng/scripts/CodeCheck.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/scripts/CodeCheck.ps1 b/eng/scripts/CodeCheck.ps1 index 947a48ab6eba..dfa5819c0112 100644 --- a/eng/scripts/CodeCheck.ps1 +++ b/eng/scripts/CodeCheck.ps1 @@ -34,6 +34,7 @@ function LogError { try { Invoke-Block { & git --version } + $PSVersionTable if ($ci) { & $repoRoot/build.ps1 -ci -norestore /t:InstallDotNet From 30563cc26e73cebb3aa8ad0289cd18d89164fa30 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 19 Feb 2019 10:06:02 -0800 Subject: [PATCH 51/60] redirect stderr from git.exe to null --- eng/scripts/CodeCheck.ps1 | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/eng/scripts/CodeCheck.ps1 b/eng/scripts/CodeCheck.ps1 index dfa5819c0112..96009b907842 100644 --- a/eng/scripts/CodeCheck.ps1 +++ b/eng/scripts/CodeCheck.ps1 @@ -33,13 +33,15 @@ function LogError { } try { - Invoke-Block { & git --version } - $PSVersionTable - if ($ci) { + # Install dotnet.exe & $repoRoot/build.ps1 -ci -norestore /t:InstallDotNet } + # + # Versions.props and Version.Details.xml + # + Write-Host "Checking that Versions.props and Version.Details.xml match" [xml] $versionProps = Get-Content "$repoRoot/eng/Versions.props" [xml] $versionDetails = Get-Content "$repoRoot/eng/Version.Details.xml" @@ -78,6 +80,10 @@ try { -filepath "$repoRoot\eng\Versions.props" } + # + # Solutions + # + Write-Host "Checking that solutions are up to date" Get-ChildItem "$repoRoot/*.sln" -Recurse ` @@ -120,7 +126,7 @@ try { } Write-Host "Run git diff to check for pending changes" - $changedFiles = git --no-pager diff --ignore-space-at-eol --name-only + $changedFiles = git --no-pager diff --ignore-space-at-eol --name-only 2> $null if ($changedFiles) { foreach ($file in $changedFiles) { $filePath = Resolve-Path "${repoRoot}/${file}" From 6eaa573693c4e0baa710918de7b7c193b89274df Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 19 Feb 2019 10:56:33 -0800 Subject: [PATCH 52/60] Suppress first-run console output --- eng/scripts/CodeCheck.ps1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eng/scripts/CodeCheck.ps1 b/eng/scripts/CodeCheck.ps1 index 96009b907842..48d6e047567d 100644 --- a/eng/scripts/CodeCheck.ps1 +++ b/eng/scripts/CodeCheck.ps1 @@ -38,6 +38,9 @@ try { & $repoRoot/build.ps1 -ci -norestore /t:InstallDotNet } + # Suppresses the 'Welcome to .NET Core!' output that breaks invocations of `dotnet sln` + $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1 + # # Versions.props and Version.Details.xml # From 9eb25c1a1d40595c9d90a1444dfebf33ec212786 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 19 Feb 2019 11:46:28 -0800 Subject: [PATCH 53/60] Try setting git config core.safecrlf false on CI --- eng/scripts/CodeCheck.ps1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/scripts/CodeCheck.ps1 b/eng/scripts/CodeCheck.ps1 index 48d6e047567d..30564db443b7 100644 --- a/eng/scripts/CodeCheck.ps1 +++ b/eng/scripts/CodeCheck.ps1 @@ -129,6 +129,10 @@ try { } Write-Host "Run git diff to check for pending changes" + if ($ci) { + # Suppress "warning: LF will be replaced by CRLF" which causes issues on some CI machines running git commands. + & git config core.safecrlf false + } $changedFiles = git --no-pager diff --ignore-space-at-eol --name-only 2> $null if ($changedFiles) { foreach ($file in $changedFiles) { From e6643d690ed96ea7dcb93d8d4f270eecbd55411b Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 19 Feb 2019 12:29:57 -0800 Subject: [PATCH 54/60] Revert "Try setting git config core.safecrlf false on CI" This reverts commit 9eb25c1a1d40595c9d90a1444dfebf33ec212786. --- eng/scripts/CodeCheck.ps1 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/eng/scripts/CodeCheck.ps1 b/eng/scripts/CodeCheck.ps1 index 30564db443b7..48d6e047567d 100644 --- a/eng/scripts/CodeCheck.ps1 +++ b/eng/scripts/CodeCheck.ps1 @@ -129,10 +129,6 @@ try { } Write-Host "Run git diff to check for pending changes" - if ($ci) { - # Suppress "warning: LF will be replaced by CRLF" which causes issues on some CI machines running git commands. - & git config core.safecrlf false - } $changedFiles = git --no-pager diff --ignore-space-at-eol --name-only 2> $null if ($changedFiles) { foreach ($file in $changedFiles) { From f1c19a4ee2d87d38e59797b863a6c450bc8e975d Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 19 Feb 2019 12:36:27 -0800 Subject: [PATCH 55/60] Attempt to handle stderr from git better Damn you, PowerShell --- eng/scripts/CodeCheck.ps1 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/eng/scripts/CodeCheck.ps1 b/eng/scripts/CodeCheck.ps1 index 48d6e047567d..512b8f0ea45a 100644 --- a/eng/scripts/CodeCheck.ps1 +++ b/eng/scripts/CodeCheck.ps1 @@ -129,9 +129,16 @@ try { } Write-Host "Run git diff to check for pending changes" - $changedFiles = git --no-pager diff --ignore-space-at-eol --name-only 2> $null + + # Redirect stderr to stdout because PowerShell does not consistently handle output to stderr + $changedFiles = & cmd /c 'git --no-pager diff --ignore-space-at-eol --name-only 2>&1' + if ($changedFiles) { foreach ($file in $changedFiles) { + if ($file -like 'warning:*') { + # git might emit warnings to stderr about CRLF vs LR, which can vary from machine to machine based on git's configuration + continue + } $filePath = Resolve-Path "${repoRoot}/${file}" LogError "Generated code is not up to date in $file." -filepath $filePath & git --no-pager diff --ignore-space-at-eol $filePath From 693dc0e70589048ab40d490fe0788e4c6209e6ad Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 19 Feb 2019 12:46:29 -0800 Subject: [PATCH 56/60] Exclude "The file will have its original line endings in your working directory" --- eng/scripts/CodeCheck.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/scripts/CodeCheck.ps1 b/eng/scripts/CodeCheck.ps1 index 512b8f0ea45a..0db4955f4658 100644 --- a/eng/scripts/CodeCheck.ps1 +++ b/eng/scripts/CodeCheck.ps1 @@ -135,7 +135,7 @@ try { if ($changedFiles) { foreach ($file in $changedFiles) { - if ($file -like 'warning:*') { + if (($file -like 'warning:*') -or ($file -like 'The file will have its original line endings*')) { # git might emit warnings to stderr about CRLF vs LR, which can vary from machine to machine based on git's configuration continue } From a4b929a148cfa98fa0bb83d96211c79c7f7be7a9 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 19 Feb 2019 13:00:32 -0800 Subject: [PATCH 57/60] Remove dead YML file --- .azure/pipelines/jobs/iisintegration-job.yml | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 .azure/pipelines/jobs/iisintegration-job.yml diff --git a/.azure/pipelines/jobs/iisintegration-job.yml b/.azure/pipelines/jobs/iisintegration-job.yml deleted file mode 100644 index c009982b332c..000000000000 --- a/.azure/pipelines/jobs/iisintegration-job.yml +++ /dev/null @@ -1,19 +0,0 @@ -jobs: -- template: default-build.yml - parameters: - buildScript: .\build.cmd - buildArgs: "-ci -test -projects src/Servers/IIS/**/*.csproj ${{ parameters.skipArgs }}" - poolName: dotnet-external-temp-vs2019 - beforeBuild: - - powershell: "& ./src/Servers/IIS/tools/InstallIISFeatures.ps1; & ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1; & ./src/Servers/IIS/tools/SetupTestEnvironment.ps1 Setup" - displayName: Prepare repo - afterBuild: - - powershell: "& ./src/Servers/IIS/tools/SetupTestEnvironment.ps1 Shutdown" - displayName: Stop AppVerifier - condition: always() - jobName: ANCM_${{ parameters.TestGroupName }} - jobDisplayName: "Test: ANCM ${{ parameters.TestGroupName }}" - artifacts: - - name: IIS_${{ parameters.TestGroupName }}_Logs - path: artifacts/logs/ - publishOnError: true From 62cd6b51762be954e7941fc75f32a9af4937b970 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 19 Feb 2019 15:24:05 -0800 Subject: [PATCH 58/60] Rename usages of win7-{x64,x86} to win-{x64,x86} --- .../Server.IntegrationTesting/src/ApplicationPublisher.cs | 2 +- .../InProcessForwardsCompatWebSite/InProcessWebSite.csproj | 6 +++--- .../testassets/InProcessWebSite/InProcessWebSite.csproj | 6 +++--- .../OutOfProcessWebSite/OutOfProcessWebSite.csproj | 6 +++--- .../IIS/test/testassets/TestTasks/InjectRequestHandler.cs | 6 +++--- src/Servers/IIS/build/testsite.props | 2 +- .../ServerComparison.TestSites.csproj | 2 +- src/SignalR/Directory.Build.targets | 2 +- src/SignalR/publish-apps.ps1 | 2 +- src/SiteExtensions/Sdk/SiteExtension.targets | 4 ++-- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/Hosting/Server.IntegrationTesting/src/ApplicationPublisher.cs b/src/Hosting/Server.IntegrationTesting/src/ApplicationPublisher.cs index 90ba2cbf256c..8ff8e9e1243e 100644 --- a/src/Hosting/Server.IntegrationTesting/src/ApplicationPublisher.cs +++ b/src/Hosting/Server.IntegrationTesting/src/ApplicationPublisher.cs @@ -105,7 +105,7 @@ private static string GetRuntimeIdentifier(DeploymentParameters deploymentParame var architecture = deploymentParameters.RuntimeArchitecture; if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { - return "win7-" + architecture; + return "win-" + architecture; } if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) { diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj index 57e5d81f7f01..6e148d22453c 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj @@ -10,9 +10,9 @@ - - - + + + diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj index 9de4366bc144..877307c1b0f7 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj @@ -10,9 +10,9 @@ - - - + + + diff --git a/src/Servers/IIS/IIS/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj index 6a387b949767..da8ee2740e76 100644 --- a/src/Servers/IIS/IIS/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj @@ -9,8 +9,8 @@ - - + + @@ -32,4 +32,4 @@ - \ No newline at end of file + diff --git a/src/Servers/IIS/IIS/test/testassets/TestTasks/InjectRequestHandler.cs b/src/Servers/IIS/IIS/test/testassets/TestTasks/InjectRequestHandler.cs index 488bd3496862..fe288c807c00 100644 --- a/src/Servers/IIS/IIS/test/testassets/TestTasks/InjectRequestHandler.cs +++ b/src/Servers/IIS/IIS/test/testassets/TestTasks/InjectRequestHandler.cs @@ -42,11 +42,11 @@ private static void Main(string[] args) if (string.IsNullOrEmpty(rid)) { bitness.Add(new JProperty($"x64/{aspnetcoreV2Name}", new JObject( - new JProperty("rid", "win7-x64"), + new JProperty("rid", "win-x64"), new JProperty("assetType", "native") ))); bitness.Add(new JProperty($"x86/{aspnetcoreV2Name}", new JObject( - new JProperty("rid", "win7-x86"), + new JProperty("rid", "win-x86"), new JProperty("assetType", "native") ))); } @@ -64,7 +64,7 @@ private static void Main(string[] args) targetLibrary = new JProperty(libraryName, new JObject( new JProperty("runtimeTargets", bitness))); - + target.AddFirst(targetLibrary); var library = libraries.Properties().FirstOrDefault(p => p.Name == libraryName); diff --git a/src/Servers/IIS/build/testsite.props b/src/Servers/IIS/build/testsite.props index 6da7d1c82494..0139fadd0af2 100644 --- a/src/Servers/IIS/build/testsite.props +++ b/src/Servers/IIS/build/testsite.props @@ -1,7 +1,7 @@ - $(RuntimeIdentifiers);win7-x64;win7-x86 + $(RuntimeIdentifiers);win-x64;win-x86 x64;x86 $(MSBuildThisFileDirectory)applicationhost.config $(MSBuildThisFileDirectory)applicationhost.iis.config diff --git a/src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj b/src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj index 50d69ccb7255..fca29b58a1e4 100644 --- a/src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj +++ b/src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj @@ -4,7 +4,7 @@ netcoreapp3.0 - win7-x86;win7-x64;linux-x64;osx-x64 + win-x86;win-x64;linux-x64;osx-x64 true diff --git a/src/SignalR/Directory.Build.targets b/src/SignalR/Directory.Build.targets index 74f2ca08b856..98307ef0ac68 100644 --- a/src/SignalR/Directory.Build.targets +++ b/src/SignalR/Directory.Build.targets @@ -5,7 +5,7 @@ SignalR - win7-x86 + win-x86 diff --git a/src/SignalR/publish-apps.ps1 b/src/SignalR/publish-apps.ps1 index 6a45f50a0f6f..ece137cf3893 100644 --- a/src/SignalR/publish-apps.ps1 +++ b/src/SignalR/publish-apps.ps1 @@ -1,4 +1,4 @@ -param($RootDirectory = (Get-Location), $Framework = "netcoreapp3.0", $Runtime = "win7-x64", $CommitHash, $BranchName, $BuildNumber) +param($RootDirectory = (Get-Location), $Framework = "netcoreapp3.0", $Runtime = "win-x64", $CommitHash, $BranchName, $BuildNumber) # De-Powershell the path $RootDirectory = (Convert-Path $RootDirectory) diff --git a/src/SiteExtensions/Sdk/SiteExtension.targets b/src/SiteExtensions/Sdk/SiteExtension.targets index ca98b5308523..3ba8f01c60d6 100644 --- a/src/SiteExtensions/Sdk/SiteExtension.targets +++ b/src/SiteExtensions/Sdk/SiteExtension.targets @@ -36,8 +36,8 @@ - - + + From a61599fe606f588b5852336b88dddbab5e60a6bc Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 19 Feb 2019 15:34:46 -0800 Subject: [PATCH 59/60] Update KoreBuild to 3.0.0-build-20190219.1 --- eng/Versions.props | 2 +- global.json | 2 +- korebuild-lock.txt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 0d6205ebf20b..4faa10959f9d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -128,7 +128,7 @@ $(KoreBuildVersion) - 3.0.0-build-feat-vs2019-20190206.1 + 3.0.0-build-20190219.1 1.0.0-alpha-004 15.9.0 1.0.0-beta2-18618-05 diff --git a/global.json b/global.json index c2675c6d274e..b4fc896ff3e7 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "version": "3.0.100-preview-010184" }, "msbuild-sdks": { - "Internal.AspNetCore.Sdk": "3.0.0-build-feat-vs2019-20190206.1" + "Internal.AspNetCore.Sdk": "3.0.0-build-20190219.1" } } diff --git a/korebuild-lock.txt b/korebuild-lock.txt index f0f5e3a8fc04..671223b6f6d1 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:3.0.0-build-feat-vs2019-20190206.1 -commithash:cc6886de9fb992c54e0c859d6347344bd4658423 +version:3.0.0-build-20190219.1 +commithash:7effe75f1408a86a9c32b592192fea1097bdd3a3 From 81d3c000da80d101d874366fda2b4746b0689dfa Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 20 Feb 2019 07:50:56 -0800 Subject: [PATCH 60/60] Apparently DOTNET_SKIP_FIRST_TIME_EXPERIENCE is not respected --- eng/scripts/CodeCheck.ps1 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/eng/scripts/CodeCheck.ps1 b/eng/scripts/CodeCheck.ps1 index 0db4955f4658..b97428395a70 100644 --- a/eng/scripts/CodeCheck.ps1 +++ b/eng/scripts/CodeCheck.ps1 @@ -38,9 +38,6 @@ try { & $repoRoot/build.ps1 -ci -norestore /t:InstallDotNet } - # Suppresses the 'Welcome to .NET Core!' output that breaks invocations of `dotnet sln` - $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1 - # # Versions.props and Version.Details.xml # @@ -99,7 +96,7 @@ try { $slnDir = Split-Path -Parent $_ $sln = $_ & dotnet sln $_ list ` - | ? { $_ -ne 'Project(s)' -and $_ -ne '----------' } ` + | ? { $_ -like '*proj' } ` | % { $proj = Join-Path $slnDir $_ if (-not (Test-Path $proj)) {