diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index b5cbf7d2a2d..707563c7c18 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -20,15 +20,16 @@ pr: - '*' jobs: -- job: Code_check - displayName: Code check - workspace: - clean: all - pool: - vmImage: vs2017-win2016 - 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 + installJdk: false + installNodeJs: false + steps: + - powershell: ./eng/scripts/CodeCheck.ps1 -ci + displayName: Run eng/scripts/CodeCheck.ps1 # Build Windows (x64/x86) - template: jobs/default-build.yml @@ -37,7 +38,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' @@ -56,7 +57,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 /bl:artifacts/logs/build.x86.binlog + - script: ./eng/scripts/cibuild.cmd -arch x86 -NoRestore /t:BuildSharedFx /p:DisableCodeSigning=true /bl:artifacts/logs/build.x86.binlog displayName: Build x86 # This is in a separate build step with -forceCoreMsbuild to workaround MAX_PATH limitations - https://github.com/Microsoft/msbuild/issues/53 @@ -66,7 +67,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 /bl:artifacts/logs/build.codesign.binlog + - script: ./build.cmd -ci -sign -NoRestore /t:CodeSign /p:SignType=$(_SignType) /p:DisableSignCheck=true /bl:artifacts/logs/build.codesign.binlog displayName: Code sign packages # Windows installers bundle both x86 and x64 assets @@ -74,7 +75,7 @@ jobs: displayName: Build Installers # Run sign check to verify everything was code signed. - - script: ./build.cmd -ci -sign /t:SignCheck /p:SignType=$(_SignType) /bl:artifacts/logs/build.signcheck.binlog + - script: ./build.cmd -ci -sign -NoRestore /t:SignCheck /p:SignType=$(_SignType) /bl:artifacts/logs/build.signcheck.binlog displayName: Run sign check condition: eq(variables['_SignType'], 'real') @@ -102,8 +103,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 +157,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: | @@ -166,6 +167,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 @@ -330,23 +332,3 @@ 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" diff --git a/.azure/pipelines/helix-test.yml b/.azure/pipelines/helix-test.yml index 2bd5284917f..b3173e456bf 100644 --- a/.azure/pipelines/helix-test.yml +++ b/.azure/pipelines/helix-test.yml @@ -8,21 +8,16 @@ pr: - '*' jobs: -- job: Helix - timeoutInMinutes: 240 - pool: - name: Hosted VS2017 - vmImage: vs2017-win2016 - 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 825df89f862..06fff26d1a2 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: @@ -91,9 +92,9 @@ jobs: name: ${{ parameters.poolName }} ${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Windows')) }}: ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: dotnet-internal-temp + name: dotnet-internal-vs2019-preview ${{ if ne(variables['System.TeamProject'], 'internal') }}: - name: dotnet-external-temp + 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 @@ -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/.azure/pipelines/jobs/iisintegration-job.yml b/.azure/pipelines/jobs/iisintegration-job.yml deleted file mode 100644 index 281bca52788..00000000000 --- a/.azure/pipelines/jobs/iisintegration-job.yml +++ /dev/null @@ -1,20 +0,0 @@ -jobs: -- template: default-build.yml - parameters: - buildScript: .\build.cmd - buildArgs: "-ci -test -projects src/Servers/IIS/**/*.csproj ${{ parameters.skipArgs }}" - poolName: "Hosted VS2017" - poolVmImage: "vs2017-win2016" - 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 diff --git a/Directory.Build.props b/Directory.Build.props index 23f27a8c72d..c4be5b528c1 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -176,6 +176,7 @@ $(ArtifactsObjDir)TargetingPack.Layout\$(Configuration)\ + diff --git a/Directory.Build.targets b/Directory.Build.targets index a5ae54b6f1e..a0ff95e2629 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -15,6 +15,11 @@ true + + + win-x64;win-x86 + + $(AssemblyName) false @@ -67,6 +72,20 @@ true + + + $(MicrosoftNETCoreAppPackageVersion) + $(MicrosoftNETCoreAppPackageVersion) + $(MicrosoftNETCoreAppPackageVersion) + + + + $(SharedFxVersion) + $(SharedFxVersion) + $(SharedFxVersion) + + + diff --git a/build.ps1 b/build.ps1 index 2b3e52b7763..6e5a86f93c6 100644 --- a/build.ps1 +++ b/build.ps1 @@ -291,7 +291,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 cdbd9853e1a..247094dfea4 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,7 +313,10 @@ 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 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" msbuild_args[${#msbuild_args[*]}]="-p:_RunTests=$run_tests" @@ -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/build/repo.props b/build/repo.props index d1393406d24..87c9fbb6f96 100644 --- a/build/repo.props +++ b/build/repo.props @@ -77,7 +77,7 @@ - + false diff --git a/build/repo.targets b/build/repo.targets index ba8999ae131..7b1b94c25e6 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/build/tasks/RepoTasks.csproj b/build/tasks/RepoTasks.csproj index ac89d3beed1..a6836228db3 100644 --- a/build/tasks/RepoTasks.csproj +++ b/build/tasks/RepoTasks.csproj @@ -2,8 +2,8 @@ - netcoreapp2.2 - net461 + netcoreapp3.0 + net472 $(DefineConstants);BUILD_MSI_TASKS false embedded @@ -12,7 +12,7 @@ - + diff --git a/build/tasks/tasks.sln b/build/tasks/tasks.sln index 917ff4ff83f..b06704c699e 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 Version 16 +VisualStudioVersion = 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/docs/BuildFromSource.md b/docs/BuildFromSource.md index 267b48331a7..403edbf53c7 100644 --- a/docs/BuildFromSource.md +++ b/docs/BuildFromSource.md @@ -11,12 +11,12 @@ 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 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/Dependencies.props b/eng/Dependencies.props index fa5b1bbbf22..adf97908006 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/Version.Details.xml b/eng/Version.Details.xml index d4af6a9b9d8..c72f509ca11 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -371,6 +371,11 @@ + + + https://github.com/dotnet/corefx + 0abec4390b30fdda97dc496594f9b1f9c9b20e17 + https://github.com/aspnet/Extensions 321f30556d63ec8af6eb0bc43d534b6b2e5458a0 diff --git a/eng/Versions.props b/eng/Versions.props index 2a11d30b012..a84ba664323 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,6 +41,8 @@ 4.6.0-preview.19109.6 4.6.0-preview.19109.6 4.6.0-preview.19109.6 + + 3.0.0-preview.19109.6 3.0.0-preview3.19115.4 3.0.0-preview3.19115.4 @@ -127,7 +129,7 @@ $(KoreBuildVersion) - 3.0.0-build-20190130.1 + 3.0.0-build-20190219.1 1.0.0-alpha-004 15.9.0 1.0.0-beta2-18618-05 diff --git a/eng/Workarounds.props b/eng/Workarounds.props new file mode 100644 index 00000000000..882180e93f4 --- /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/Workarounds.targets b/eng/Workarounds.targets index 7c9693585b5..49c121924a8 100644 --- a/eng/Workarounds.targets +++ b/eng/Workarounds.targets @@ -1,5 +1,19 @@ + + + + + + + + + + $(MicrosoftNETCorePlatformsPackageVersion) + &1' + if ($changedFiles) { foreach ($file in $changedFiles) { + 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 + } $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 diff --git a/eng/scripts/GenerateProjectList.ps1 b/eng/scripts/GenerateProjectList.ps1 index 53cbe581384..adee357de40 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 diff --git a/eng/scripts/InstallVisualStudio.ps1 b/eng/scripts/InstallVisualStudio.ps1 index 310508f3959..5d4f1bdd1bb 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/scripts/vs.json b/eng/scripts/vs.json index af9903867a9..cc54ea916d3 100644 --- a/eng/scripts/vs.json +++ b/eng/scripts/vs.json @@ -1,30 +1,27 @@ { - "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.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.VisualStudio.Component.Azure.Storage.Emulator", "Microsoft.VisualStudio.Component.VC.ATL", - "Microsoft.VisualStudio.Component.Windows10SDK.15063.Desktop", + "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", - "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/eng/targets/CSharp.Common.props b/eng/targets/CSharp.Common.props index f55984e3309..e999f558aa2 100644 --- a/eng/targets/CSharp.Common.props +++ b/eng/targets/CSharp.Common.props @@ -24,6 +24,18 @@ + + + + + + + + + diff --git a/eng/targets/Wix.Common.props b/eng/targets/Wix.Common.props index a6d4d145398..e6b1337fcba 100644 --- a/eng/targets/Wix.Common.props +++ b/eng/targets/Wix.Common.props @@ -17,7 +17,7 @@ $(MSBuildToolsPath)\NuGet.targets - + diff --git a/eng/tools/tools.sln b/eng/tools/tools.sln index 527e47cbc3d..1ef2bbc860b 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 Version 16 +VisualStudioVersion = 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/global.json b/global.json index c69ded73a17..b4fc896ff3e 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-20190205.1" + "Internal.AspNetCore.Sdk": "3.0.0-build-20190219.1" } } diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 8ff4b72c9ef..671223b6f6d 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:3.0.0-build-20190205.1 -commithash:d311c7e5300aed235a1f902a53dd9be02e5ac861 +version:3.0.0-build-20190219.1 +commithash:7effe75f1408a86a9c32b592192fea1097bdd3a3 diff --git a/korebuild.json b/korebuild.json index 03522109948..34ab616652e 100644 --- a/korebuild.json +++ b/korebuild.json @@ -12,11 +12,14 @@ "Windows" ], "includePrerelease": true, - "versionRange": "[15.8, 16.0)", + "versionRange": "[16.0.28608.199, 17.0)", "requiredWorkloads": [ - "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", "Microsoft.VisualStudio.Component.VC.ATL", - "Microsoft.VisualStudio.Component.Windows10SDK.17134" + "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" ] } } diff --git a/src/Antiforgery/Antiforgery.sln b/src/Antiforgery/Antiforgery.sln index b4e5774f088..fc64202e7f9 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 Version 16 +VisualStudioVersion = 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 a1666b7e321..469f73ec02e 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 Version 16 +VisualStudioVersion = 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/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 0a981c18c7f..d589f47d924 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 1e674a78deb..ae03d619200 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 6b9a99731fb..a7fccbdd3e2 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 25e2626cfe2..6507faaaa9b 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/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.sln b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.sln index 9879df84930..e25f102981f 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 Version 16 +VisualStudioVersion = 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/Blazor/testassets/HostedInAspNet.Client/HostedInAspNet.Client.csproj b/src/Components/Blazor/testassets/HostedInAspNet.Client/HostedInAspNet.Client.csproj index adab74454e1..2b08bef0608 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 dc93f7a937a..fcd9502fc4f 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 6c60c1580f2..a488d15a579 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 1dc35e0ca4b..b1b28785f92 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 6c60c1580f2..a488d15a579 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/Components.sln b/src/Components/Components.sln index 5193181c772..423c9ea1720 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.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/Components/test/testassets/BasicTestApp/BasicTestApp.csproj b/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj index 7de6b2d63a9..5499fb368a3 100644 --- a/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj +++ b/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj @@ -11,7 +11,6 @@ - diff --git a/src/Components/test/testassets/ComponentsApp.App/ComponentsApp.App.csproj b/src/Components/test/testassets/ComponentsApp.App/ComponentsApp.App.csproj index e845bc60d49..317f4b715af 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 14ff94d2261..be50b6a4991 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 f61c27f865e..2048580e176 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 d8d70bdf764..a56f986a37b 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/DataProtection/DataProtection.sln b/src/DataProtection/DataProtection.sln index c943b8dbc76..c2a33d97e2f 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 Version 16 +VisualStudioVersion = 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 7c7a6387f7d..d8096aecfd6 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 Version 16 +VisualStudioVersion = 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/Framework/pkg/Metapackage.targets b/src/Framework/pkg/Metapackage.targets index 51479945e57..d8831bbf4d7 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/ref/Microsoft.AspNetCore.App.Ref.csproj b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj index 8fa309887fa..a59765a75fe 100644 --- a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj +++ b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj @@ -81,7 +81,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'));" /> diff --git a/src/Framework/src/Microsoft.AspNetCore.App.shfxproj b/src/Framework/src/Microsoft.AspNetCore.App.shfxproj index eb5013b9de9..a5c0d7dd65c 100644 --- a/src/Framework/src/Microsoft.AspNetCore.App.shfxproj +++ b/src/Framework/src/Microsoft.AspNetCore.App.shfxproj @@ -11,10 +11,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 e9b2918fc4d..cbd36bc9623 100644 --- a/src/Framework/src/SharedFx.targets +++ b/src/Framework/src/SharedFx.targets @@ -13,11 +13,12 @@ This targets file should only be imported by .shfxproj files. PreBuildEvent; ResolveReferences; GenerateSharedFxVersionsFile; + GenerateBuildDependencyFile; PrepareForPublish; - ComputeAndCopyFilesToPublishDirectory; GeneratePublishDependencyFile; GenerateSharedFxMetadataFiles; - GeneratePublishRuntimeConfigurationFile; + GenerateBuildRuntimeConfigurationFiles; + ComputeAndCopyFilesToPublishDirectory; CopySharedFxToOutput; CollectSharedFxOutput; PostBuildEvent; @@ -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 - - @@ -209,12 +203,12 @@ This targets file should only be imported by .shfxproj files. - + - - - - + + + + diff --git a/src/Hosting/Hosting.sln b/src/Hosting/Hosting.sln index 437491ba104..4574b901ef7 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 Version 16 +VisualStudioVersion = 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/Hosting/Server.IntegrationTesting/src/ApplicationPublisher.cs b/src/Hosting/Server.IntegrationTesting/src/ApplicationPublisher.cs index 90ba2cbf256..8ff8e9e1243 100644 --- a/src/Hosting/Server.IntegrationTesting/src/ApplicationPublisher.cs +++ b/src/Hosting/Server.IntegrationTesting/src/ApplicationPublisher.cs @@ -105,7 +105,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting var architecture = deploymentParameters.RuntimeArchitecture; if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { - return "win7-" + architecture; + return "win-" + architecture; } if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) { diff --git a/src/Http/HttpAbstractions.sln b/src/Http/HttpAbstractions.sln index 3a1bc205678..ee2deb20573 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 Version 16 +VisualStudioVersion = 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/ApiAuthorization.IdentityServer/samples/ApiAuthSample/ApiAuthSample.csproj b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/ApiAuthSample.csproj index 21493eae44d..df96819c67c 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/Identity.sln b/src/Identity/Identity.sln index 5aa2abf45ae..9a1b05a8176 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 Version 16 +VisualStudioVersion = 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/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj b/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj index f45e79b9a61..dfa2ae65253 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 45574a14ac1..e2ec0518f38 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/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/Common.sln b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/Common.sln index 5b48ec67699..b3c0f651f7a 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 Version 16 +VisualStudioVersion = 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 4ec3c19636c..c5f3343b395 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 Version 16 +VisualStudioVersion = 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 06d98cfebe4..d5d02c7bb97 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 Version 16 +VisualStudioVersion = 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 8bde720ff94..4222e021fbc 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.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/Middleware/SpaServices/samples/Webpack/Webpack.csproj b/src/Middleware/SpaServices/samples/Webpack/Webpack.csproj index cd46134c008..494b84a7801 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/MusicStore.sln b/src/MusicStore/MusicStore.sln index 87c90e57011..396c0140737 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 Version 16 +VisualStudioVersion = 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/MusicStore/samples/MusicStore/MusicStore.csproj b/src/MusicStore/samples/MusicStore/MusicStore.csproj index f720307d052..7310b2d2c73 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 @@ -33,7 +33,6 @@ - diff --git a/src/Mvc/Mvc.sln b/src/Mvc/Mvc.sln index c5a783de801..dcf56fc9937 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 = 10.0.40219.1 +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}") = "test", "test", "{3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}" diff --git a/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj b/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj index ef8b17d1e20..c3ac81d3d54 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 c6c4324285e..436e060a6e5 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 22a5b9d99b7..ca14afc0b5b 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 9d3ee6d8446..510f26e32ee 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 2f86cf71b88..63b09ef8fa5 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 d452f269a8f..97ef847b07f 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 d0ab5347134..e409e9764b6 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 e4c1a38652d..6f600027f6c 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 97ceb074dec..e10c2e168b9 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 76177e17895..77bed0b15f1 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 62fe5f58b23..110ba0c8cce 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 5e4df59fcca..a7ccaf6ebff 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 edf7a035d9f..f6b24e30ec3 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 68730eaad34..145510e30e1 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 b750961151f..67d19453c6f 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 13b3843f6c6..4717009c541 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/ProjectTemplates/test/GenerateTestProps.targets b/src/ProjectTemplates/test/GenerateTestProps.targets index 72ea3153870..5112861a1ca 100644 --- a/src/ProjectTemplates/test/GenerateTestProps.targets +++ b/src/ProjectTemplates/test/GenerateTestProps.targets @@ -3,9 +3,10 @@ RestoreSources=$([MSBuild]::Escape("$(RestoreSources);$(ArtifactsShippingPackagesDir);$(ArtifactsNonShippingPackagesDir)")); - RuntimeFrameworkVersion=$(RuntimeFrameworkVersion); + 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 80b2e83f2f8..288cad0c423 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 @@ namespace Templates.Test.Helpers } } + 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/Helpers/TemplateTestBase.cs b/src/ProjectTemplates/test/Helpers/TemplateTestBase.cs index 5aee2f0af95..3aabb3efd0f 100644 --- a/src/ProjectTemplates/test/Helpers/TemplateTestBase.cs +++ b/src/ProjectTemplates/test/Helpers/TemplateTestBase.cs @@ -22,7 +22,6 @@ namespace Templates.Test 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 @@ $@" 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 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 @@ $@" { }"; - + // 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/ProjectTemplates.Tests.csproj b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj index 0cf39006308..f9c357a09d2 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\ + diff --git a/src/ProjectTemplates/test/TemplateTests.props.in b/src/ProjectTemplates/test/TemplateTests.props.in index 9353422afa0..ff2c8a9cc41 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} + + - - + + + + diff --git a/src/Razor/Razor.sln b/src/Razor/Razor.sln index 70997b7b98f..861cd2e3c84 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 Version 16 +VisualStudioVersion = 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 eb15591240b..4b528f17d57 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 Version 16 +VisualStudioVersion = 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 b2735e5b235..4a62c0ede39 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.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/Security/samples/ClaimsTransformation/ClaimsTransformation.csproj b/src/Security/samples/ClaimsTransformation/ClaimsTransformation.csproj index 91734de3057..356b19430d3 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 91734de3057..356b19430d3 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 70e4609aae1..f0608927d25 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 2c65adebbad..d72d8146710 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 cf7f7ee9b79..fc5f7fded59 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 91734de3057..356b19430d3 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 b9b72ef3a67..5061fcb0228 100644 --- a/src/Security/samples/StaticFilesAuth/StaticFilesAuth.csproj +++ b/src/Security/samples/StaticFilesAuth/StaticFilesAuth.csproj @@ -38,7 +38,6 @@ - diff --git a/src/Servers/FunctionalTests.sln b/src/Servers/FunctionalTests.sln index 82ddc71dc8e..d8e444ee8f6 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 Version 16 +VisualStudioVersion = 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 00d95c3e60a..eacce125343 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 Version 16 +VisualStudioVersion = 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/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj index b4ee236c236..9cd9c724eae 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj @@ -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 ae001a5f7c1..913c11f077f 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -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 4eb76067276..ab6ef63e106 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj @@ -196,4 +196,4 @@ true - \ 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 c3969aedc3e..aba60e9aab9 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj @@ -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 799ee2176bd..6eb6cb55baa 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj @@ -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 e84f9d4c88c..34317141490 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj @@ -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 1e5c7920c0c..e94c099487c 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj @@ -217,4 +217,4 @@ - \ No newline at end of file + diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj index 57e5d81f7f0..6e148d22453 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 9de4366bc14..877307c1b0f 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 6a387b94976..da8ee2740e7 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 488bd349686..fe288c807c0 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 @@ namespace TestTasks 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 @@ namespace TestTasks 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/IIS/test/testassets/TestTasks/TestTasks.csproj b/src/Servers/IIS/IIS/test/testassets/TestTasks/TestTasks.csproj index 91bdf2a6aee..77237de91f8 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/Servers/IIS/IISIntegration.sln b/src/Servers/IIS/IISIntegration.sln index 39acf0c5392..54e3681013c 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 Version 16 +VisualStudioVersion = 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/IIS/build/Build.Settings b/src/Servers/IIS/build/Build.Settings index e68136bb2b1..ce1d870e75c 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) diff --git a/src/Servers/IIS/build/testsite.props b/src/Servers/IIS/build/testsite.props index 6da7d1c8249..0139fadd0af 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/Kestrel.sln b/src/Servers/Kestrel.sln index 5691575b6b1..8276ae5711d 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 Version 16 +VisualStudioVersion = 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/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj b/src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj index 50d69ccb725..fca29b58a1e 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 74f2ca08b85..98307ef0ac6 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/SignalR.sln b/src/SignalR/SignalR.sln index d237ecd1303..92a5ab94142 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.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 2d6131dea75..728345be1b3 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.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 1dd5ebe2152..5d78086fb4b 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 Version 16 +VisualStudioVersion = 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}" 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 a8ca3e302a8..2f45eb84a5d 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 6d2f625d16d..30bf64403a0 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 74adbdddd1a..445ee3b840a 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 c18ff51d0b4..cb2f600b2b5 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", diff --git a/src/SignalR/publish-apps.ps1 b/src/SignalR/publish-apps.ps1 index 6a45f50a0f6..ece137cf389 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/HostingStartup/HostingStartup.csproj b/src/SiteExtensions/Sdk/HostingStartup/HostingStartup.csproj index 6faa3b0919a..9628c2f525e 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 beed2c8708f..3ba8f01c60d 100644 --- a/src/SiteExtensions/Sdk/SiteExtension.targets +++ b/src/SiteExtensions/Sdk/SiteExtension.targets @@ -27,7 +27,7 @@ - + @@ -36,8 +36,8 @@ - - + + 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 7888dc8e557..a7903fc79c7 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 b5f7744bca4..da234603086 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/Internal/ProjectIdResolver.cs b/src/Tools/dotnet-user-secrets/src/Internal/ProjectIdResolver.cs index da5111ca515..b04cf8306d4 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 @@ namespace Microsoft.Extensions.SecretManager.Tools.Internal 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)) { 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 9c79fcd7cbb..d2b94d95236 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 e30ba355f75..b289e142877 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