diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 006a83260a..6d638e14cf 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: + vmImage: vs2017-win2016 + steps: + - powershell: ./eng/scripts/CodeCheck.ps1 -ci - template: jobs/default-build.yml parameters: jobName: Windows_Build @@ -51,4 +59,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/e2e-tests.yml b/.azure/pipelines/e2e-tests.yml deleted file mode 100644 index fecf598d59..0000000000 --- a/.azure/pipelines/e2e-tests.yml +++ /dev/null @@ -1,134 +0,0 @@ -trigger: none -phases: -- phase: Host_Windows - queue: - name: Hosted VS2017 - parallel: 8 - matrix: - Portable_Node8: - Test.RuntimeIdentifier: none - Node.Version: 8.x - Portable_Node10: - Test.RuntimeIdentifier: none - Node.Version: 10.x - SelfContainedWindows_Node8: - Test.RuntimeIdentifier: win-x64 - Node.Version: 8.x - SelfContainedWindows_Node10: - Test.RuntimeIdentifier: win-x64 - Node.Version: 10.x - SelfContainedLinux_Node8: - Test.RuntimeIdentifier: linux-x64 - Node.Version: 8.x - SelfContainedLinux_Node10: - Test.RuntimeIdentifier: linux-x64 - Node.Version: 10.x - SelfContainedMacOs_Node8: - Test.RuntimeIdentifier: osx-x64 - Node.Version: 8.x - SelfContainedMacOs_Node10: - Test.RuntimeIdentifier: osx-x64 - Node.Version: 10.x - steps: - - task: NodeTool@0 - displayName: Install Node $(Node.Version) - inputs: - versionSpec: $(Node.Version) - - powershell: | - test/Cli.FunctionalTests/run-tests.ps1 -ci -ProdConManifestUrl $env:PRODCONMANIFESTURL -TestRuntimeIdentifier $(Test.RuntimeIdentifier) -AdditionalRestoreSources $env:ADDITIONALRESTORESOURCES - condition: ne(variables['PB_SkipTests'], 'true') - displayName: Run E2E tests - - task: PublishTestResults@2 - displayName: Publish test results - condition: always() - inputs: - testRunner: vstest - testResultsFiles: 'artifacts/logs/**/*.trx' -- phase: Host_macOS - queue: - name: Hosted macOS - parallel: 8 - matrix: - Portable_Node8: - Test.RuntimeIdentifier: none - Node.Version: 8.x - Portable_Node10: - Test.RuntimeIdentifier: none - Node.Version: 10.x - SelfContainedWindows_Node8: - Test.RuntimeIdentifier: win-x64 - Node.Version: 8.x - SelfContainedWindows_Node10: - Test.RuntimeIdentifier: win-x64 - Node.Version: 10.x - SelfContainedLinux_Node8: - Test.RuntimeIdentifier: linux-x64 - Node.Version: 8.x - SelfContainedLinux_Node10: - Test.RuntimeIdentifier: linux-x64 - Node.Version: 10.x - SelfContainedMacOs_Node8: - Test.RuntimeIdentifier: osx-x64 - Node.Version: 8.x - SelfContainedMacOs_Node10: - Test.RuntimeIdentifier: osx-x64 - Node.Version: 10.x - steps: - - task: NodeTool@0 - displayName: Install Node $(Node.Version) - inputs: - versionSpec: $(Node.Version) - - powershell: | - test/Cli.FunctionalTests/run-tests.ps1 -ci -ProdConManifestUrl $env:PRODCONMANIFESTURL -TestRuntimeIdentifier $(Test.RuntimeIdentifier) -AdditionalRestoreSources $env:ADDITIONALRESTORESOURCES - condition: ne(variables['PB_SkipTests'], 'true') - displayName: Run E2E tests - - task: PublishTestResults@2 - displayName: Publish test results - condition: always() - inputs: - testRunner: vstest - testResultsFiles: 'artifacts/logs/**/*.trx' -- phase: Host_Linux - queue: - name: Hosted Linux Preview - parallel: 8 - matrix: - Portable_Node8: - Test.RuntimeIdentifier: none - Node.Version: 8.x - Portable_Node10: - Test.RuntimeIdentifier: none - Node.Version: 10.x - SelfContainedWindows_Node8: - Test.RuntimeIdentifier: win-x64 - Node.Version: 8.x - SelfContainedWindows_Node10: - Test.RuntimeIdentifier: win-x64 - Node.Version: 10.x - SelfContainedLinux_Node8: - Test.RuntimeIdentifier: linux-x64 - Node.Version: 8.x - SelfContainedLinux_Node10: - Test.RuntimeIdentifier: linux-x64 - Node.Version: 10.x - SelfContainedMacOs_Node8: - Test.RuntimeIdentifier: osx-x64 - Node.Version: 8.x - SelfContainedMacOs_Node10: - Test.RuntimeIdentifier: osx-x64 - Node.Version: 10.x - steps: - - task: NodeTool@0 - displayName: Install Node $(Node.Version) - inputs: - versionSpec: $(Node.Version) - - powershell: | - test/Cli.FunctionalTests/run-tests.ps1 -ci -ProdConManifestUrl $env:PRODCONMANIFESTURL -TestRuntimeIdentifier $(Test.RuntimeIdentifier) -AdditionalRestoreSources $env:ADDITIONALRESTORESOURCES - condition: ne(variables['PB_SkipTests'], 'true') - displayName: Run E2E tests - - task: PublishTestResults@2 - displayName: Publish test results - condition: always() - inputs: - testRunner: vstest - testResultsFiles: 'artifacts/logs/**/*.trx' diff --git a/.azure/pipelines/pr-validation-temp.yml b/.azure/pipelines/pr-validation-temp.yml deleted file mode 100644 index 218598aaeb..0000000000 --- a/.azure/pipelines/pr-validation-temp.yml +++ /dev/null @@ -1,38 +0,0 @@ -# This configuration is temporary while we work on getting all unit tests to pass on PR checks - -# Don't run CI for this config -trigger: none - -# Run PR validation on all branches -pr: - branches: - include: - - '*' - -jobs: -- template: jobs/default-build.yml - parameters: - jobName: Windows_Build - jobDisplayName: "Build only : Windows" - agentOs: Windows - buildArgs: -all -pack -- template: jobs/default-build.yml - parameters: - jobName: macOs_Build - jobDisplayName: "Build only : macOS" - agentOs: macOS - buildArgs: --all --pack -- template: jobs/default-build.yml - parameters: - jobName: Linux_Build - jobDisplayName: "Build only : Linux" - agentOs: Linux - buildArgs: --all --pack -- job: Code_check - displayName: Code check - workspace: - clean: all - pool: - vmImage: vs2017-win2016 - steps: - - powershell: ./eng/scripts/CodeCheck.ps1 -ci diff --git a/Directory.Build.props b/Directory.Build.props index d8dd289d56..401c624da4 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -63,17 +63,7 @@ false - - - Microsoft400 - 3PartySHA2 - Microsoft400 - NuGet - VsixSHA2 - MicrosoftJAR - - - + @@ -85,6 +75,7 @@ $(ArtifactsPackagesDir)Shipping\ $(ArtifactsPackagesDir)NonShipping\ $(ArtifactsDir)installers\$(Configuration)\ + $(ArtifactsDir)VSSetup\$(Configuration)\ @@ -92,6 +83,7 @@ + diff --git a/Directory.Build.targets b/Directory.Build.targets index 971f2a16a9..1654fd256f 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -20,8 +20,6 @@ - - true $(PackagesInPatch.Contains(' $(PackageId);')) diff --git a/build.ps1 b/build.ps1 index 470cd13b7d..e2cb9fd0d1 100644 --- a/build.ps1 +++ b/build.ps1 @@ -9,9 +9,6 @@ This build script installs required tools and runs an MSBuild command on this re This script can be used to invoke various targets, such as targets to produce packages, build projects, run tests, and generate code. -.PARAMETER RepoPath -The folder to build. Defaults to the folder containing this script. This will be removed soon. - .PARAMETER CI Sets up CI specific settings and variables. @@ -71,10 +68,6 @@ Online version: https://github.com/aspnet/AspNetCore/blob/master/docs/BuildFromS #> [CmdletBinding(PositionalBinding = $false, DefaultParameterSetName='Groups')] param( - # Bootstrapper options - [Obsolete('This parameter will be removed when we finish https://github.com/aspnet/AspNetCore/issues/4246')] - [string]$RepoRoot = $PSScriptRoot, - [switch]$CI, # Build lifecycle options @@ -203,7 +196,6 @@ if ($Help) { exit 1 } -$RepoRoot = Resolve-Path $RepoRoot $Channel = 'master' $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' $ConfigFile = Join-Path $PSScriptRoot 'korebuild.json' @@ -273,8 +265,7 @@ $MSBuildArguments += "/p:_RunSign=$Sign" Import-Module -Force -Scope Local (Join-Path $korebuildPath 'KoreBuild.psd1') try { - $RepoRoot = Resolve-Path $RepoRoot - Set-KoreBuildSettings -ToolsSource $ToolsSource -DotNetHome $DotNetHome -RepoPath $RepoRoot -ConfigFile $ConfigFile -CI:$CI + Set-KoreBuildSettings -ToolsSource $ToolsSource -DotNetHome $DotNetHome -RepoPath $PSScriptRoot -ConfigFile $ConfigFile -CI:$CI if ($ForceCoreMsbuild) { $global:KoreBuildSettings.MSBuildType = 'core' } diff --git a/build.sh b/build.sh index 9e13e4bd4a..0ce513c03e 100755 --- a/build.sh +++ b/build.sh @@ -14,7 +14,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" verbose=false update=false reinstall=false -repo_path="$DIR" lockfile_path="$DIR/korebuild-lock.txt" config_file="$DIR/korebuild.json" channel='master' @@ -151,12 +150,6 @@ while [[ $# -gt 0 ]]; do __usage --no-exit exit 0 ;; - --repo-root|-RepoRoot) - shift - __warn '--repo-root is obsolete and will be removed when we finish https://github.com/aspnet/AspNetCore/issues/4246' - repo_path="${1:-}" - [ -z "$repo_path" ] && __error "Missing value for parameter --repo-root" && __usage - ;; --restore|-[Rr]estore) run_restore=true ;; @@ -280,7 +273,7 @@ msbuild_args[${#msbuild_args[*]}]="-p:_RunTests=$run_tests" # 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 -set_korebuildsettings "$tools_source" "$DOTNET_HOME" "$repo_path" "$config_file" "$ci" +set_korebuildsettings "$tools_source" "$DOTNET_HOME" "$DIR" "$config_file" "$ci" # This incantation avoids unbound variable issues if msbuild_args is empty # https://stackoverflow.com/questions/7577052/bash-empty-array-expansion-with-set-u diff --git a/build/AzureIntegration.targets b/build/AzureIntegration.targets index 67858c4d07..90961cf1f4 100644 --- a/build/AzureIntegration.targets +++ b/build/AzureIntegration.targets @@ -3,13 +3,11 @@ $(MSBuildThisFileDirectory)..\src\AzureIntegration\ - + AspNetUniverseBuildOffline=true; RepositoryRoot=$(AzureIntegrationProjectRoot); - DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath); - DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath); VersionSuffix=$(VersionSuffix); BuildNumberSuffix=$(BuildNumberSuffix); Configuration=$(Configuration); diff --git a/build/CodeSign.props b/build/CodeSign.props index 6aef3ba9c4..d3e6f7b573 100644 --- a/build/CodeSign.props +++ b/build/CodeSign.props @@ -1,85 +1,45 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/build/CodeSign.targets b/build/CodeSign.targets index fecc25ee41..a32d135c33 100644 --- a/build/CodeSign.targets +++ b/build/CodeSign.targets @@ -2,73 +2,22 @@ $(CodeSignDependsOn);CollectFileSignInfo + $(IntermediateDir)ar\$(SharedFxRid)\ - - + - <_RepositoryProject Remove="@(_RepositoryProject)" /> - <_RepositoryProject Include="$(MSBuildProjectFullPath)" Condition="'%(Repository.Identity)' != ''"> - RepositoryRoot=%(Repository.RootPath) - %(Repository.Build) - - <_ShippedRepositoryProject Include="$(MSBuildProjectFullPath)" Condition="'%(ShippedRepository.Identity)' != ''"> - RepositoryRoot=%(ShippedRepository.RootPath) - false - - + + + + + + - - - AssemblySigningCertName=$(AssemblySigningCertName); - AssemblySigning3rdPartyCertName=$(AssemblySigning3rdPartyCertName); - PowerShellSigningCertName=$(PowerShellSigningCertName); - PackageSigningCertName=$(PackageSigningCertName); - VsixSigningCertName=$(VsixSigningCertName); - JarSigningCertName=$(JarSigningCertName); - ArtifactsDir=$(ArtifactsDir) - - - - - - - - - - - - - <_FilesToSign Include="@(_RepoFileSignInfo)" Condition="'%(_RepoFileSignInfo.IsFileToSign)' == 'true' AND ('$(_ReposWereBuilt)' == 'true' OR '%(_RepoFileSignInfo.Container)' != '' ) " /> - <_FilesToSign Include="@(_ShippedRepoFileSignInfo)" Condition="'%(_ShippedRepoFileSignInfo.IsFileToSign)' == 'true' AND '%(_ShippedRepoFileSignInfo.Container)' != '' " /> - - - - <_Temp Remove="@(_Temp)" /> - <_Temp Include="@(FilesToExcludeFromSigning)" /> - - - <_Temp Remove="@(_Temp)" /> - - - - - - - - - - - <_FileSignInfo Include="@(FilesToSign)" IsFileToSign="true" /> - <_FileSignInfo Include="@(FilesToExcludeFromSigning)" IsFileToExcludeFromSign="true" /> + + + + diff --git a/build/RepositoryBuild.targets b/build/RepositoryBuild.targets deleted file mode 100644 index 1b06131f08..0000000000 --- a/build/RepositoryBuild.targets +++ /dev/null @@ -1,160 +0,0 @@ - - - - - false - - <_NoBuildRepos>$(NoBuild) - <_BuildScriptToExecute Condition="'$(OS)'!='Windows_NT'">build.sh - <_BuildScriptToExecute Condition="'$(OS)'=='Windows_NT'">build.cmd - - - - - - $(SubmoduleRoot)%(Identity)\ - - - %(RepositoryBuildOrder.Order) - %(RepositoryBuildOrder.Identity) - - RepositoryToBuild=%(RepositoryBuildOrder.Identity); - BuildRepositoryRoot=$([MSBuild]::NormalizeDirectory(%(RepositoryBuildOrder.RootPath))) - - - - - - - - - - <_ReposWereBuilt>true - <_NoBuildRepos>true - - - - - - - - - - - - - - - - - - - - - - - true - - $(RepositoryBuildArguments) -ci - - $(RepositoryBuildArguments) /p:AspNetUniverseBuildOffline=true - $(RepositoryBuildArguments) /p:IsUniverseBuild=true - - $(RepositoryBuildArguments) /p:DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath) - $(RepositoryBuildArguments) /p:DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath) - - $(RepositoryBuildArguments) /p:SignType= - $(RepositoryBuildArguments) /p:VersionSuffix=$(VersionSuffix) - $(RepositoryBuildArguments) /p:BuildNumberSuffix=$(BuildNumberSuffix) - $(RepositoryBuildArguments) /p:Configuration=$(Configuration) - $(RepositoryBuildArguments) /p:IsFinalBuild=$(IsFinalBuild) - - $(RepositoryBuildArguments) /p:DisablePackageReferenceRestrictions=true - - $(RepositoryBuildArguments) /p:DisableCodeSigning=true - $(RepositoryBuildArguments) '/p:DotNetAssetRootAccessTokenSuffix=$(DotNetAssetRootAccessTokenSuffix)' - $(RepositoryBuildArguments) '/p:DotNetAssetRootUrl=$(DotNetAssetRootUrl)' - $(RepositoryBuildArguments) /p:SkipAspNetCoreRuntimeInstall=true - - - - - - /t:CleanArtifacts /t:Build /p:SkipTests=true $(RepositoryBuildArguments) - $(BuildArguments) /bl:$(LogOutputDir)$(RepositoryToBuild).build.binlog - $(BuildRepositoryRoot)artifacts\msbuild\ - - - - - - - - - - - - - - - - - - - - - - - /t:Test /p:NoBuild=$(_NoBuildRepos) $(RepositoryBuildArguments) - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/SharedFrameworkOnly.props b/build/SharedFrameworkOnly.props index 4b09eadbca..58f688c678 100644 --- a/build/SharedFrameworkOnly.props +++ b/build/SharedFrameworkOnly.props @@ -20,7 +20,7 @@ - + diff --git a/build/SharedFx.targets b/build/SharedFx.targets index 5a2de7b8bc..b02070716a 100644 --- a/build/SharedFx.targets +++ b/build/SharedFx.targets @@ -2,11 +2,8 @@ $(RepositoryRoot)src\Framework\test\Microsoft.AspNetCore.App.UnitTests.csproj $([MSBuild]::NormalizePath($(UnitTestFxProject))) - $(CodeSignDependsOn);GetSharedFxFilesToSign _BuildSharedFxProjects;TestSharedFx $(BuildSharedFxDependsOn);CodeSign - $(IntermediateDir)ar\$(SharedFxRid)\ - $(GetArtifactInfo);GetFxProjectArtifactInfo @@ -24,27 +21,7 @@ - - - - - - - - - - - - - - - - - - - - - + <_RestoreGraphProjectInput>@(FxProjectToBuild) @@ -52,8 +29,6 @@ $(BuildProperties); SharedFxRid=$(SharedFxRid); SharedFxArchitecture=$(SharedFxArchitecture); - DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath); - DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath); PackageVersion=$(PackageVersion) @@ -73,7 +48,7 @@ SkipNonexistentTargets="true" /> - + @@ -104,35 +79,4 @@ - - - <_InspectionTargetsFile>$(MSBuildProjectDirectory)\Project.Inspection.targets - - - - <_Temp Remove="@(_Temp)" /> - - - - - - - - - - - - - - - - - - - diff --git a/build/artifacts.props b/build/artifacts.props deleted file mode 100644 index c8e9f73feb..0000000000 --- a/build/artifacts.props +++ /dev/null @@ -1,172 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/buildorder.props b/build/buildorder.props deleted file mode 100644 index 9271e4cb92..0000000000 --- a/build/buildorder.props +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/build/external-dependencies.props b/build/external-dependencies.props deleted file mode 100644 index e9b08f2897..0000000000 --- a/build/external-dependencies.props +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/repo.props b/build/repo.props index ce306409ff..b0fe3fd01d 100644 --- a/build/repo.props +++ b/build/repo.props @@ -13,11 +13,10 @@ false - $(RepositoryRoot)src\ - $(ArtifactsDir)packages\$(Configuration)\Shipping\ $(ArtifactsDir)packages\$(Configuration)\NonShipping\ $(ArtifactsDir)installers\$(Configuration)\ + $(ArtifactsDir)VSSetup\$(Configuration)\ $(RepositoryRoot)eng\signcheck.exclusions.txt @@ -161,10 +160,7 @@ + - - - - diff --git a/build/repo.targets b/build/repo.targets index e1570d49aa..578368867c 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -1,18 +1,14 @@ - - + $(BuildProperties);BuildToolsTaskAssembly=$(_BuildToolsAssembly) - $(IntermediateDir)dependencies.g.props - $(IntermediateDir)sources.g.props - Prepare @@ -23,37 +19,25 @@ true true - $(PrepareDependsOn);VerifyPackageArtifactConfig;VerifyExternalDependencyConfig;PrepareOutputPaths - - $(CleanDependsOn);CleanArtifacts;CleanRepoArtifacts + $(CleanDependsOn);CleanArtifacts $(RestoreDependsOn);InstallDotNet;RestoreProjects Restore - $(CompileDependsOn);BuildProjects;PackSharedSources - $(CompileDependsOn);PackProjects;BuildRepositories;BuildSharedFx + $(CompileDependsOn);BuildProjects $(PackageDependsOn);PackProjects - $(PackageDependsOn);RemoveSharedFrameworkOnlyRefsFromNuspec + $(PackageDependsOn);BuildSharedFx;RemoveSharedFrameworkOnlyRefsFromNuspec $(TestDependsOn);Compile $(TestDependsOn);TestProjects - $(TestDependsOn);_TestRepositories - - $(GetArtifactInfoDependsOn);GetProjectArtifactInfo - $(GetArtifactInfoDependsOn);ResolveSharedSourcesPackageInfo - $(GetArtifactInfoDependsOn);ResolveRepoInfo $(CodeSignDependsOn);RemoveSharedFrameworkOnlyRefsFromNuspec - - - - - - - - - - - - - - - $(BuildProperties);MicrosoftNETCoreAppPackageVersion=$(MicrosoftNETCoreAppPackageVersion); - - - - <_RepositoryProject Include="$(MSBuildProjectFullPath)" Condition="'%(Repository.Identity)' != ''"> - RepositoryRoot=%(Repository.RootPath) - %(Repository.Build) - - - - - - - - - - - - - - - - - - - - - - <_Temp Remove="@(_Temp)" /> - <_Temp Include="@(PackageArtifact)" /> - - - - - - - - - - - - <_PackageArtifactWithoutMatchingInfo Include="@(_Temp)" Exclude="@(PackageArtifact)" /> - - - - - - - - %(ShippedArtifactInfo.Version) - - - - <_PackageArtifactSpec Include="@(PackageArtifact)" /> - - - - - <_ShippedSolution Update="@(_ShippedSolution)" Build="false" IsPatching="false" /> - <_NoBuildSolution Update="@(_NoBuildSolution)" Build="false" /> - - - - - - - <_LineupPackages Include="@(ExternalDependency)" /> - <_LineupPackages Include="%(ArtifactInfo.PackageId)" Version="%(ArtifactInfo.Version)" Condition=" '%(ArtifactInfo.ArtifactType)' == 'NuGetPackage' " /> - - <_RestoreSources Include="$(ArtifactsShippingPackagesDir)" /> - <_RestoreSources Include="$(ArtifactsNonShippingPackagesDir)" /> - <_RestoreSources Include="$(RestoreSources)" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_UndeclaredPackageArtifact Include="%(ArtifactInfo.PackageId)" Condition="'%(ArtifactInfo.ArtifactType)' == 'NuGetPackage'" /> - <_UndeclaredPackageArtifact Remove="@(PackageArtifact)" /> - - - - - - - - - - - - - - - - - - - - - <_BuildOutput Include="$(ArtifactsShippingPackagesDir)%(PackageArtifact.Identity).*.nupkg" - Condition=" '%(PackageArtifact.Category)' == 'ship' " /> - - + <_BuildOutput Include="$(ArtifactsShippingPackagesDir)*.nupkg" + Exclude="$(ArtifactsShippingPackagesDir)*.symbols.nupkg" /> + FrameworkOnlyPackages="@(SharedFrameworkOnlyPackage)" /> - - - - - - diff --git a/build/runtimes.props b/build/runtimes.props index 5a0848ef3b..37259f3135 100644 --- a/build/runtimes.props +++ b/build/runtimes.props @@ -13,12 +13,6 @@ Arch="x86" Feed="$(DotNetAssetRootUrl)" FeedCredential="$(DotNetAssetRootAccessTokenSuffix)" /> - - - diff --git a/build/sources.props b/build/sources.props index 2b3d86b634..e32fdfb649 100644 --- a/build/sources.props +++ b/build/sources.props @@ -12,29 +12,19 @@ $(RestoreSources); https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json; https://api.nuget.org/v3/index.json; - - - $(RestoreSources); - https://dotnet.myget.org/F/dotnet-core/api/v3/index.json; https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; - https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json; https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json; + https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json; https://dotnet.myget.org/F/blazor-dev/api/v3/index.json; - https://dotnet.myget.org/F/roslyn/api/v3/index.json; + https://dotnet.myget.org/F/dotnet-core/api/v3/index.json; https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json; - https://vside.myget.org/F/vssdk/api/v3/index.json; + https://dotnet.myget.org/F/roslyn/api/v3/index.json; + https://vside.myget.org/F/devcore/api/v3/index.json; https://vside.myget.org/F/vsmac/api/v3/index.json; - https://vside.myget.org/F/devcore/api/v3/index.json + https://vside.myget.org/F/vssdk/api/v3/index.json; - - - $(RestoreSources); - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; - - - https://dotnetcli.blob.core.windows.net/dotnet/ - $(PublicCoreFeedPrefix) + https://dotnetcli.blob.core.windows.net/dotnet/ diff --git a/build/submodules.props b/build/submodules.props deleted file mode 100644 index bd8b7b79a1..0000000000 --- a/build/submodules.props +++ /dev/null @@ -1,40 +0,0 @@ - - - - true - - - ProductChangesOnly - - - - false - ProductChangesOnly - - - - - - true - - - - - diff --git a/build/tasks/JoinRepoItems.cs b/build/tasks/JoinRepoItems.cs deleted file mode 100644 index 97f0ab9d0f..0000000000 --- a/build/tasks/JoinRepoItems.cs +++ /dev/null @@ -1,122 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; - -namespace RepoTasks -{ - public class JoinRepoItems : Task - { - [Required] - public ITaskItem[] Left { get; set; } - - [Required] - public ITaskItem[] Right { get; set; } - - // The metadata to use as the new item spec. If not specified, LeftKey is used. - public string LeftItemSpec { get; set; } - - // LeftKey and RightKey: The metadata to join on. If not set, then use the ItemSpec - public string LeftKey { get; set; } - - public string RightKey { get; set; } - - - // LeftMetadata and RightMetadata: The metadata names to include in the result. Specify "*" to include all metadata - public string[] LeftMetadata { get; set; } - - public string[] RightMetadata { get; set; } - - - [Output] - public ITaskItem[] JoinResult { get; private set; } - - public override bool Execute() - { - bool useAllLeftMetadata = LeftMetadata != null && LeftMetadata.Length == 1 && LeftMetadata[0] == "*"; - bool useAllRightMetadata = RightMetadata != null && RightMetadata.Length == 1 && RightMetadata[0] == "*"; - var newItemSpec = string.IsNullOrEmpty(LeftItemSpec) - ? LeftKey - : LeftItemSpec; - - JoinResult = Left.Join(Right, - item => GetKeyValue(LeftKey, item), - item => GetKeyValue(RightKey, item), - (left, right) => - { - // If including all metadata from left items and none from right items, just return left items directly - if (useAllLeftMetadata && - string.IsNullOrEmpty(LeftKey) && - string.IsNullOrEmpty(LeftItemSpec) && - (RightMetadata == null || RightMetadata.Length == 0)) - { - return left; - } - - // If including all metadata from right items and none from left items, just return the right items directly - if (useAllRightMetadata && - string.IsNullOrEmpty(RightKey) && - string.IsNullOrEmpty(LeftItemSpec) && - (LeftMetadata == null || LeftMetadata.Length == 0)) - { - return right; - } - - var ret = new TaskItem(GetKeyValue(newItemSpec, left)); - - // Weird ordering here is to prefer left metadata in all cases, as CopyToMetadata doesn't overwrite any existing metadata - if (useAllLeftMetadata) - { - // CopyMetadata adds an OriginalItemSpec, which we don't want. So we subsequently remove it - left.CopyMetadataTo(ret); - ret.RemoveMetadata("OriginalItemSpec"); - } - - if (!useAllRightMetadata && RightMetadata != null) - { - foreach (string name in RightMetadata) - { - ret.SetMetadata(name, right.GetMetadata(name)); - } - } - - if (!useAllLeftMetadata && LeftMetadata != null) - { - foreach (string name in LeftMetadata) - { - ret.SetMetadata(name, left.GetMetadata(name)); - } - } - - if (useAllRightMetadata) - { - // CopyMetadata adds an OriginalItemSpec, which we don't want. So we subsequently remove it - right.CopyMetadataTo(ret); - ret.RemoveMetadata("OriginalItemSpec"); - } - - return (ITaskItem)ret; - }, - StringComparer.OrdinalIgnoreCase).ToArray(); - - return true; - } - - static string GetKeyValue(string key, ITaskItem item) - { - if (string.IsNullOrEmpty(key)) - { - return item.ItemSpec; - } - else - { - return item.GetMetadata(key); - } - } - } -} diff --git a/build/tasks/OrderBy.cs b/build/tasks/OrderBy.cs deleted file mode 100644 index a761d6f093..0000000000 --- a/build/tasks/OrderBy.cs +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Linq; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; - -namespace RepoTasks -{ - public class OrderBy : Task - { - [Required] - [Output] - public ITaskItem[] Items { get; set; } - - public string Key { get; set; } - - public override bool Execute() - { - var key = string.IsNullOrEmpty(Key) - ? "Identity" - : Key; - Items = Items.OrderBy(k => k.GetMetadata(key)).ToArray(); - return true; - } - } -} diff --git a/build/tasks/RepoTasks.csproj b/build/tasks/RepoTasks.csproj index 06c08355a3..70aa9c6518 100644 --- a/build/tasks/RepoTasks.csproj +++ b/build/tasks/RepoTasks.csproj @@ -6,6 +6,7 @@ net461 $(DefineConstants);BUILD_MSI_TASKS $(DefineConstants);BUILD_AZ_TASKS + true diff --git a/build/tasks/RepoTasks.tasks b/build/tasks/RepoTasks.tasks index e073e49173..54e1e69495 100644 --- a/build/tasks/RepoTasks.tasks +++ b/build/tasks/RepoTasks.tasks @@ -6,8 +6,6 @@ - - diff --git a/docs/Artifacts.md b/docs/Artifacts.md index cbb9b55659..450d19f627 100644 --- a/docs/Artifacts.md +++ b/docs/Artifacts.md @@ -12,10 +12,13 @@ artifacts/ *.zip, *.tar.gz = archives versions of installers packages/ $(Configuration)/ - Shipping/ = Packages which are intended for use by customers. These, along with installers, represent the 'product'. + Shipping/ = Packages which are intended for use by customers. These, along with installers, represent the 'product'. *.nupkg = NuGet packages which ship to nuget.org *.jar = Java packages which ship to Maven Central and others *.tgz = NPM packages which ship to npmjs.org NonShipping/ *.nupkg = NuGet packages for internal use only. Used to hand off bits to Microsoft partner teams. Not intended for use by customers. + VSSetup/ + $(Configuration)/ + *.vsix = Visual Studio extensions ``` diff --git a/docs/PreparingPatchUpdates.md b/docs/PreparingPatchUpdates.md index 34813e8162..17f8102539 100644 --- a/docs/PreparingPatchUpdates.md +++ b/docs/PreparingPatchUpdates.md @@ -10,32 +10,7 @@ In order to prepare this repo to build a new servicing update, the following cha + 8 ``` -* Update the package archive baselines. This is used to make sure each build of the package archives we give to Azure only contains new files and does - not require overwriting existing files. See [src/PackageArchive/ZipManifestGenerator/](/src/PackageArchive/ZipManifestGenerator/README.md) for instructions on how to run this tool. - * Update the package baselines. This is used to ensure packages keep a consistent set of dependencies between releases. See [eng/tools/BaselineGenerator/](/eng/tools/BaselineGenerator/README.md) for instructions on how to run this tool. -* **For packages with source code in this repo (not a submodule):** Update the list of packages in [eng/PatchConfig.props](/eng/PatchConfig.props) to list which packages should be patching in this release. - -* **For packages still building from submodules:** Update the list of repositories which will contain changes in [build/submodules.props](/build/submodules.props). - - * `` items represent repos which were released in a previous patch, and will not contain servicing updates in the next patch. - * `` items represent repos which will produce new packages in this patch. - * It is usually best to move everything to `` and then iteratively add them back to `` as new repos receive approval to patch. - * Don't change the `PatchPolicy` attribute. The build system uses this to ensure patching rules are obeyed. - -* For each repository still listed as a ``, update the version.props file in that submodule. For example, https://github.com/aspnet/Templating/pull/824 - - * The version prefix in repos should match the version of ASP.NET Core. - * Exception: SignalR, which is "1.1", not "2.1". - * This leaves holes in versioning, which is okay. This may mean you increment the patch value by more than one. Example: - * EF Core ships patches in 2.1.4 as "2.1.4" - * EF Core does not ship patches in 2.1.5 or 2.1.6 - * EF Core ships in 2.1.7, therefore, EFCore's version.props file should jump from 2.1.4 to 2.1.7. - - ```diff - - - 2.1.4 - + 2.1.7 - ``` +* Update the list of packages in [eng/PatchConfig.props](/eng/PatchConfig.props) to list which packages should be patching in this release. diff --git a/docs/ReferenceResolution.md b/docs/ReferenceResolution.md index e0c3dbf6f4..e34b90a072 100644 --- a/docs/ReferenceResolution.md +++ b/docs/ReferenceResolution.md @@ -18,9 +18,10 @@ The requirements that led to this system are: ## Recommendations for writing a .csproj -* Use `` -* Do not use `` -* Only use `` in test projects +* Use ``. +* Do not use ``. +* If you need to use a new package, add it to `eng/Dependencies.props` and `eng/Versions.props`. +* Only use `` in test projects. * Name the .csproj file to match the assembly name. * Run `build.cmd /t:GenerateProjectList` when adding new projects * Use [eng/tools/BaseLineGenerator/](/eng/tools/BaselineGenerator/README.md) if you need to update baselines. diff --git a/eng/Dependencies.props b/eng/Dependencies.props index c615f349a4..4c93386079 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -76,9 +76,9 @@ and are generated based on the last package release. + - @@ -108,6 +108,7 @@ and are generated based on the last package release. + @@ -131,6 +132,7 @@ and are generated based on the last package release. + diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index 376ed8a7c9..3638e9f988 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -20,7 +20,6 @@ - @@ -46,11 +45,8 @@ - - - @@ -128,7 +124,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6e860276b2..b4d0ecafe1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,10 +21,6 @@ https://github.com/aspnet/EntityFrameworkCore 3d1e08eb08789a9dde3ac20851d3c82fdf9272e5 - - https://github.com/aspnet/EntityFrameworkCore - 3d1e08eb08789a9dde3ac20851d3c82fdf9272e5 - https://github.com/aspnet/EntityFrameworkCore 3d1e08eb08789a9dde3ac20851d3c82fdf9272e5 @@ -133,10 +129,6 @@ https://github.com/aspnet/Extensions 0de62ae930da31048ba7e54c8cd0c6c0bcbd9095 - - https://github.com/aspnet/Extensions - 0de62ae930da31048ba7e54c8cd0c6c0bcbd9095 - https://github.com/aspnet/Extensions 0de62ae930da31048ba7e54c8cd0c6c0bcbd9095 diff --git a/eng/Versions.props b/eng/Versions.props index 373281d6e4..cc118ca492 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,7 +58,6 @@ 3.0.0-preview.19074.2 3.0.0-preview.19074.2 3.0.0-preview.19074.2 - 3.0.0-preview.19074.2 3.0.0-preview.19074.2 3.0.0-preview.19074.2 3.0.0-preview.19074.2 @@ -95,7 +94,6 @@ 3.0.0-preview.19074.2 3.0.0-preview.19074.3 - 3.0.0-preview.19074.3 3.0.0-preview.19074.3 3.0.0-preview.19074.3 3.0.0-preview.19074.3 diff --git a/eng/Workarounds.targets b/eng/Workarounds.targets new file mode 100644 index 0000000000..30f58a1220 --- /dev/null +++ b/eng/Workarounds.targets @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/eng/targets/CSharp.Common.props b/eng/targets/CSharp.Common.props index 8e774beb44..b8849afad7 100644 --- a/eng/targets/CSharp.Common.props +++ b/eng/targets/CSharp.Common.props @@ -2,17 +2,14 @@ 7.3 - - - SHA256 - + - + diff --git a/eng/targets/Npm.Common.targets b/eng/targets/Npm.Common.targets index 2bbed5f9be..79f975532f 100644 --- a/eng/targets/Npm.Common.targets +++ b/eng/targets/Npm.Common.targets @@ -69,16 +69,4 @@ - - - - NpmPackage - $(PackageId) - $(PackageVersion) - - - - - - diff --git a/eng/targets/Packaging.targets b/eng/targets/Packaging.targets index d7326254e3..5e5b8014d8 100644 --- a/eng/targets/Packaging.targets +++ b/eng/targets/Packaging.targets @@ -7,27 +7,6 @@ See $(RepositoryRoot)eng\tools\BaselineGenerator\README.md for instructions on updating this baseline." /> - - - - - $(PackageOutputPath)$(PackageId).$(PackageVersion).nupkg - - - - - NuGetPackage - $(PackageId) - $(PackageVersion) - $(RepositoryRoot) - true - - - - diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index 03d40146ca..d9e04521b1 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -52,10 +52,9 @@ <_ImplicitPackageReference Include="@(PackageReference->WithMetadataValue('IsImplicitlyDefined', 'true'))" /> - <_ExplicitPackageReference Include="@(PackageReference)" Exclude="@(_ImplicitPackageReference)" /> - - <_ExplicitPackageReference Remove="Internal.AspNetCore.Sdk" /> - <_ExplicitPackageReference Remove="Microsoft.NETFramework.ReferenceAssemblies" /> + <_AllowedExplicitPackageReference Include="@(PackageReference->WithMetadataValue('AllowExplicitReference', 'true'))" /> + <_AllowedExplicitPackageReference Include="FSharp.Core" Condition="'$(MSBuildProjectExtension)' == '.fsproj'" /> + <_ExplicitPackageReference Include="@(PackageReference)" Exclude="@(_ImplicitPackageReference);@(_AllowedExplicitPackageReference)" /> <_UnusedProjectReferenceProvider Include="@(ProjectReferenceProvider)" Exclude="@(Reference)" /> @@ -133,9 +132,8 @@ <_ImplicitPackageReference Remove="@(_ImplicitPackageReference)" /> - + <_ExplicitPackageReference Remove="@(_ExplicitPackageReference)" /> @@ -146,7 +144,7 @@ + Text="Could not resolve this reference. Could not locate the package or project for "%(Reference.Identity)". Did you update baselines and dependencies lists? See docs/ReferenceResolution.md for more details." /> diff --git a/eng/tools/XplatPackageSigner/XplatPackageSigner.proj b/eng/tools/XplatPackageSigner/XplatPackageSigner.proj index d3cdde63cc..6efe7e2eab 100644 --- a/eng/tools/XplatPackageSigner/XplatPackageSigner.proj +++ b/eng/tools/XplatPackageSigner/XplatPackageSigner.proj @@ -22,13 +22,12 @@ - $(PackageSigningCertName) + NuGet - diff --git a/src/Components/Analyzers/src/Microsoft.AspNetCore.Components.Analyzers.csproj b/src/Components/Analyzers/src/Microsoft.AspNetCore.Components.Analyzers.csproj index 6f03745885..b38c807057 100644 --- a/src/Components/Analyzers/src/Microsoft.AspNetCore.Components.Analyzers.csproj +++ b/src/Components/Analyzers/src/Microsoft.AspNetCore.Components.Analyzers.csproj @@ -18,7 +18,6 @@ - diff --git a/src/Components/Blazor/BlazorExtension/src/Microsoft.VisualStudio.BlazorExtension.csproj b/src/Components/Blazor/BlazorExtension/src/Microsoft.VisualStudio.BlazorExtension.csproj index 3d09ede878..301470dfdf 100644 --- a/src/Components/Blazor/BlazorExtension/src/Microsoft.VisualStudio.BlazorExtension.csproj +++ b/src/Components/Blazor/BlazorExtension/src/Microsoft.VisualStudio.BlazorExtension.csproj @@ -15,6 +15,7 @@ false false false + true diff --git a/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj b/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj index bc43115c74..e1b38e5602 100644 --- a/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj +++ b/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj @@ -16,39 +16,6 @@ $(IntermediatePackDir)$(TargetFramework)/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Components/Blazor/Cli/src/Microsoft.AspNetCore.Blazor.Cli.csproj b/src/Components/Blazor/Cli/src/Microsoft.AspNetCore.Blazor.Cli.csproj index 0f711382cd..65a79b17a2 100644 --- a/src/Components/Blazor/Cli/src/Microsoft.AspNetCore.Blazor.Cli.csproj +++ b/src/Components/Blazor/Cli/src/Microsoft.AspNetCore.Blazor.Cli.csproj @@ -7,7 +7,10 @@ Microsoft.AspNetCore.Blazor.Cli true Microsoft.AspNetCore.Blazor.Cli.Program - + false Development server for use when building Blazor applications. diff --git a/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj b/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj index 7f909a7afe..f33d8fcc67 100644 --- a/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj +++ b/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj @@ -8,14 +8,9 @@ False 2008 Templates for ASP.NET Core Blazor projects. + false - - - - - - - - + diff --git a/src/DataProtection/samples/EntityFrameworkCoreSample/EntityFrameworkCoreSample.csproj b/src/DataProtection/samples/EntityFrameworkCoreSample/EntityFrameworkCoreSample.csproj index b2a220acda..0796b4d4b8 100644 --- a/src/DataProtection/samples/EntityFrameworkCoreSample/EntityFrameworkCoreSample.csproj +++ b/src/DataProtection/samples/EntityFrameworkCoreSample/EntityFrameworkCoreSample.csproj @@ -6,14 +6,11 @@ - - - - - - - - + + + + + diff --git a/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj b/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj index 2b5a0c1df3..469f493fcc 100644 --- a/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj +++ b/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj @@ -9,9 +9,10 @@ + + + - - diff --git a/src/Framework/Directory.Build.props b/src/Framework/Directory.Build.props index 9f54c3ac3f..814b72900b 100644 --- a/src/Framework/Directory.Build.props +++ b/src/Framework/Directory.Build.props @@ -1,15 +1,12 @@ - - - - + - true + + $(RestoreSources); + $(ArtifactsShippingPackagesDir); + $(ArtifactsNonShippingPackagesDir) + diff --git a/src/Framework/Microsoft.AspNetCore.App.props b/src/Framework/Microsoft.AspNetCore.App.props index d77e644483..8384ce8c3f 100644 --- a/src/Framework/Microsoft.AspNetCore.App.props +++ b/src/Framework/Microsoft.AspNetCore.App.props @@ -3,141 +3,139 @@ --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Framework/pkg/Metapackage.targets b/src/Framework/pkg/Metapackage.targets index 6307d33621..085adf3a85 100644 --- a/src/Framework/pkg/Metapackage.targets +++ b/src/Framework/pkg/Metapackage.targets @@ -18,6 +18,7 @@ $(MSBuildProjectName) $(PackageOutputPath)$(PackageId).$(PackageVersion).nupkg + @@ -29,7 +30,7 @@ true - + diff --git a/src/Framework/src/SharedFx.targets b/src/Framework/src/SharedFx.targets index 9027f74b31..59489cd7bf 100644 --- a/src/Framework/src/SharedFx.targets +++ b/src/Framework/src/SharedFx.targets @@ -139,7 +139,7 @@ This targets file should only be imported by .shfxproj files. true - + Runtime;Native true @@ -333,34 +333,6 @@ This targets file should only be imported by .shfxproj files. - - - $(PackageOutputPath)$(PackageId).$(PackageVersion).nupkg - $(PackageOutputPath)$(PackageId).$(PackageVersion).symbols.nupkg - - - - - NuGetPackage - $(PackageId) - $(PackageVersion) - $(RepositoryRoot) - $(PackageSigningCertName) - true - true - - - NuGetSymbolsPackage - $(PackageId) - $(PackageVersion) - $(RepositoryRoot) - $(PackageSigningCertName) - true - true - - - - diff --git a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj index 7642891eae..9738986733 100644 --- a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj +++ b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj @@ -3,7 +3,6 @@ netcoreapp3.0 Microsoft.AspNetCore - false @@ -28,7 +27,7 @@ - + @@ -40,11 +39,9 @@ - - <_Parameter1>SharedFxDependencies - <_Parameter2>@(ExpectedAssemblyNames) + <_Parameter2>@(Dependency);@(ExternalDependency) <_Parameter1>MetadataOutputPath diff --git a/src/Hosting/Server.IntegrationTesting/src/Microsoft.AspNetCore.Server.IntegrationTesting.csproj b/src/Hosting/Server.IntegrationTesting/src/Microsoft.AspNetCore.Server.IntegrationTesting.csproj index 12f22c7936..b483b048e6 100644 --- a/src/Hosting/Server.IntegrationTesting/src/Microsoft.AspNetCore.Server.IntegrationTesting.csproj +++ b/src/Hosting/Server.IntegrationTesting/src/Microsoft.AspNetCore.Server.IntegrationTesting.csproj @@ -2,17 +2,15 @@ ASP.NET Core helpers to deploy applications to IIS Express, IIS, WebListener and Kestrel for testing. - $(ExperimentalVersionPrefix) - $(ExperimentalVersionSuffix) - false - $(ExperimentalPackageVersion) netcoreapp3.0 + false $(NoWarn);CS1591 true aspnetcore;testing - false - true - true + true + + false + true diff --git a/src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj b/src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj index 92c7bf9bee..8aba2780e9 100644 --- a/src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj +++ b/src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj @@ -9,7 +9,8 @@ - + + diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj b/src/Identity/ApiAuthorization.IdentityServer/src/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj index d3f272a544..681e278213 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj +++ b/src/Identity/ApiAuthorization.IdentityServer/src/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj @@ -6,6 +6,8 @@ true aspnetcore;apiauth;identity false + + false diff --git a/src/Installers/Archive/Archive.Internal.zipproj b/src/Installers/Archive/Archive.Internal.zipproj index fe6c0c9c7e..9c0356ae82 100644 --- a/src/Installers/Archive/Archive.Internal.zipproj +++ b/src/Installers/Archive/Archive.Internal.zipproj @@ -47,5 +47,4 @@ Overwrite="true" /> - diff --git a/src/Installers/Archive/Archive.Redist.zipproj b/src/Installers/Archive/Archive.Redist.zipproj index c2c19617b6..04114c0706 100644 --- a/src/Installers/Archive/Archive.Redist.zipproj +++ b/src/Installers/Archive/Archive.Redist.zipproj @@ -106,5 +106,4 @@ Overwrite="true" /> - diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props index 88b706c2e7..9b8ebef520 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props +++ b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props @@ -1,6 +1,5 @@ - diff --git a/src/Middleware/CORS/test/FunctionalTests/FunctionalTests.csproj b/src/Middleware/CORS/test/FunctionalTests/FunctionalTests.csproj index 91ebcdd2a7..6977fdbcd1 100644 --- a/src/Middleware/CORS/test/FunctionalTests/FunctionalTests.csproj +++ b/src/Middleware/CORS/test/FunctionalTests/FunctionalTests.csproj @@ -14,10 +14,10 @@ + - diff --git a/src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj b/src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj index 3f5e2d4a75..ee5ff33e91 100644 --- a/src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj +++ b/src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj @@ -22,12 +22,12 @@ - + + - diff --git a/src/Middleware/WebSockets/test/ConformanceTests/AutobahnTestApp/AutobahnTestApp.csproj b/src/Middleware/WebSockets/test/ConformanceTests/AutobahnTestApp/AutobahnTestApp.csproj index ee6c43d6d2..27988f2008 100644 --- a/src/Middleware/WebSockets/test/ConformanceTests/AutobahnTestApp/AutobahnTestApp.csproj +++ b/src/Middleware/WebSockets/test/ConformanceTests/AutobahnTestApp/AutobahnTestApp.csproj @@ -10,20 +10,13 @@ - - - - - - - + + + + - - - - diff --git a/src/Middleware/WebSockets/test/ConformanceTests/Microsoft.AspNetCore.WebSockets.ConformanceTests.csproj b/src/Middleware/WebSockets/test/ConformanceTests/Microsoft.AspNetCore.WebSockets.ConformanceTests.csproj index 5b009d7d65..45aefa89d5 100644 --- a/src/Middleware/WebSockets/test/ConformanceTests/Microsoft.AspNetCore.WebSockets.ConformanceTests.csproj +++ b/src/Middleware/WebSockets/test/ConformanceTests/Microsoft.AspNetCore.WebSockets.ConformanceTests.csproj @@ -6,11 +6,10 @@ - - + - + diff --git a/src/Middleware/WebSockets/test/UnitTests/Microsoft.AspNetCore.WebSockets.Tests.csproj b/src/Middleware/WebSockets/test/UnitTests/Microsoft.AspNetCore.WebSockets.Tests.csproj index fd13f1944f..879ed1707b 100644 --- a/src/Middleware/WebSockets/test/UnitTests/Microsoft.AspNetCore.WebSockets.Tests.csproj +++ b/src/Middleware/WebSockets/test/UnitTests/Microsoft.AspNetCore.WebSockets.Tests.csproj @@ -5,7 +5,8 @@ - + + diff --git a/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj b/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj index 3603ca8429..d5a887ef27 100644 --- a/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj +++ b/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj b/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj index 6e5e88e453..5cc6259844 100644 --- a/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj +++ b/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj @@ -6,7 +6,8 @@ $(DefineConstants);GENERATE_SQL_SCRIPTS $(DefineConstants);__RemoveThisBitTo__GENERATE_SQL_SCRIPTS - CS8002;$(WarningsNotAsErrors) + + false true @@ -17,6 +18,8 @@ + + diff --git a/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj b/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj index 10a068db81..ef8b17d1e2 100644 --- a/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj +++ b/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj @@ -6,21 +6,20 @@ $(DefineConstants);GENERATE_SQL_SCRIPTS $(DefineConstants);__RemoveThisBitTo__GENERATE_SQL_SCRIPTS - CS8002;$(WarningsNotAsErrors) + + false true - - - - + + diff --git a/src/Mvc/samples/MvcSandbox/MvcSandbox.csproj b/src/Mvc/samples/MvcSandbox/MvcSandbox.csproj index 3e0d928151..a2ce82290f 100644 --- a/src/Mvc/samples/MvcSandbox/MvcSandbox.csproj +++ b/src/Mvc/samples/MvcSandbox/MvcSandbox.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/Mvc/src/GetDocumentInsider/GetDocumentInsider.csproj b/src/Mvc/src/GetDocumentInsider/GetDocumentInsider.csproj index 81f0d939d7..3b09c3a0db 100644 --- a/src/Mvc/src/GetDocumentInsider/GetDocumentInsider.csproj +++ b/src/Mvc/src/GetDocumentInsider/GetDocumentInsider.csproj @@ -18,7 +18,9 @@ - + + true + diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.csproj index 3478a92fb8..4d9d6e4ea2 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.csproj @@ -15,10 +15,6 @@ - - - - diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj index ef2a747a17..f874b02d1e 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj @@ -20,10 +20,6 @@ - - - - diff --git a/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.csproj b/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.csproj index 650a39dcca..d0976a5eaa 100644 --- a/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.csproj +++ b/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.csproj @@ -25,48 +25,8 @@ - - - - - - - $(AssemblySigningCertName) - tasks/$(TargetFramework)/$(TargetFileName) - $(AssemblySigningStrongName) - - - - - - - $(AssemblySigningCertName) - tools/dotnet-getdocument.dll - $(AssemblySigningStrongName) - - - $(AssemblySigningCertName) - tools/net461/GetDocument.Insider.exe - $(AssemblySigningStrongName) - - - $(AssemblySigningCertName) - tools/net461-x86/GetDocument.Insider.exe - $(AssemblySigningStrongName) - - - $(AssemblySigningCertName) - tools/netcoreapp2.0/GetDocument.Insider.exe - $(AssemblySigningStrongName) - - - - tools/Newtonsoft.Json.dll" - $(AssemblySigning3rdPartyCertName) - + + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj index b4e4e33ab0..8df756d388 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj @@ -6,6 +6,8 @@ $(DefineConstants);GENERATE_BASELINES $(DefineConstants);__RemoveThisBitTo__GENERATE_BASELINES + + false diff --git a/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj b/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj index 215c89466a..d707c7e533 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj +++ b/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj @@ -9,16 +9,6 @@ true - - - - - - - - - - diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj b/src/ProjectTemplates/Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj index c3821289c5..67e73ec7b4 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj @@ -9,11 +9,6 @@ true - - - - - diff --git a/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj b/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj index 2f3e6efb97..fb386d335c 100644 --- a/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj +++ b/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj @@ -9,6 +9,7 @@ + @@ -21,7 +22,6 @@ - diff --git a/src/Servers/IIS/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj b/src/Servers/IIS/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj index 618969b709..d068560ccd 100644 --- a/src/Servers/IIS/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj +++ b/src/Servers/IIS/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj @@ -23,7 +23,6 @@ - @@ -35,9 +34,13 @@ False - - - + - \ No newline at end of file + + + + + + + diff --git a/src/Servers/IIS/IIS/samples/NativeIISSample/NativeIISSample.csproj b/src/Servers/IIS/IIS/samples/NativeIISSample/NativeIISSample.csproj index 8abe6d3e64..a4b0011593 100644 --- a/src/Servers/IIS/IIS/samples/NativeIISSample/NativeIISSample.csproj +++ b/src/Servers/IIS/IIS/samples/NativeIISSample/NativeIISSample.csproj @@ -8,10 +8,11 @@ + + - diff --git a/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj index 985d1af857..6794e767a3 100644 --- a/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj +++ b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj @@ -16,7 +16,6 @@ - @@ -39,7 +38,7 @@ - + - - - - - - - AspNetCoreModuleV2 - - - diff --git a/src/Servers/IIS/IIS/test/Common.Tests/Common.Tests.csproj b/src/Servers/IIS/IIS/test/Common.Tests/Common.Tests.csproj index 145ece3005..6875776d10 100644 --- a/src/Servers/IIS/IIS/test/Common.Tests/Common.Tests.csproj +++ b/src/Servers/IIS/IIS/test/Common.Tests/Common.Tests.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj index 402dca8441..77a89c5360 100644 --- a/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj +++ b/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj @@ -18,18 +18,22 @@ False + + - - + + true + + + true + - - diff --git a/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj index f96d80f092..f43d201320 100644 --- a/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj +++ b/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj @@ -16,6 +16,7 @@ False + @@ -24,7 +25,6 @@ - diff --git a/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj index afe3b52a94..cde9d3127b 100644 --- a/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj +++ b/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj @@ -16,6 +16,8 @@ False + + @@ -25,8 +27,6 @@ - - diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj b/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj index 0b75a23e4e..c82b5dee7e 100644 --- a/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj +++ b/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj @@ -9,12 +9,12 @@ + - diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj index 92a4d6d952..43b038567f 100644 --- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj +++ b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj @@ -12,11 +12,12 @@ - False + + @@ -24,8 +25,6 @@ - - diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj index ec78062e91..c18df234e8 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj @@ -18,8 +18,10 @@ - - + + + true + diff --git a/src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.csproj b/src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.csproj index 46f912e71f..c482539247 100644 --- a/src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.csproj +++ b/src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.csproj @@ -1,6 +1,5 @@  - ASP.NET Core components for working with the IIS AspNetCoreModule. netcoreapp3.0 @@ -10,10 +9,6 @@ true - - - - diff --git a/src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.targets b/src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.targets deleted file mode 100644 index a5f7fc6088..0000000000 --- a/src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.targets +++ /dev/null @@ -1,7 +0,0 @@ - - - - AspNetCoreModuleV2 - - - diff --git a/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj b/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj index 248367ddb0..7b249660bb 100644 --- a/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj +++ b/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj @@ -8,10 +8,11 @@ true aspnetcore;iis True - true - true - true 2.0.0 + true + + true + false @@ -43,7 +44,7 @@ - + @@ -52,8 +53,8 @@ + - diff --git a/src/Servers/Kestrel/perf/PlatformBenchmarks/PlatformBenchmarks.csproj b/src/Servers/Kestrel/perf/PlatformBenchmarks/PlatformBenchmarks.csproj index c121dd51c6..78041dec70 100644 --- a/src/Servers/Kestrel/perf/PlatformBenchmarks/PlatformBenchmarks.csproj +++ b/src/Servers/Kestrel/perf/PlatformBenchmarks/PlatformBenchmarks.csproj @@ -7,7 +7,6 @@ latest true true - true diff --git a/src/Servers/Kestrel/test/Interop.FunctionalTests/Interop.FunctionalTests.csproj b/src/Servers/Kestrel/test/Interop.FunctionalTests/Interop.FunctionalTests.csproj index b420aac5f5..cbc4c1fad4 100644 --- a/src/Servers/Kestrel/test/Interop.FunctionalTests/Interop.FunctionalTests.csproj +++ b/src/Servers/Kestrel/test/Interop.FunctionalTests/Interop.FunctionalTests.csproj @@ -4,7 +4,8 @@ netcoreapp3.0 true Interop.FunctionalTests - CS8002;$(WarningsNotAsErrors) + + false diff --git a/src/Servers/Kestrel/tools/CodeGenerator/CodeGenerator.csproj b/src/Servers/Kestrel/tools/CodeGenerator/CodeGenerator.csproj index a310696ef1..195464e98f 100644 --- a/src/Servers/Kestrel/tools/CodeGenerator/CodeGenerator.csproj +++ b/src/Servers/Kestrel/tools/CodeGenerator/CodeGenerator.csproj @@ -3,10 +3,8 @@ netcoreapp3.0 Exe - false true - false - true + true diff --git a/src/Servers/test/FunctionalTests/Directory.Build.props b/src/Servers/test/FunctionalTests/Directory.Build.props index 61a2a369ca..bfda02311c 100644 --- a/src/Servers/test/FunctionalTests/Directory.Build.props +++ b/src/Servers/test/FunctionalTests/Directory.Build.props @@ -8,6 +8,6 @@ - + diff --git a/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj b/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj index d8262d23ee..4163c6ddf8 100644 --- a/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj +++ b/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Servers/testassets/ServerComparison.TestSites/Directory.Build.props b/src/Servers/testassets/ServerComparison.TestSites/Directory.Build.props index 61a2a369ca..bfda02311c 100644 --- a/src/Servers/testassets/ServerComparison.TestSites/Directory.Build.props +++ b/src/Servers/testassets/ServerComparison.TestSites/Directory.Build.props @@ -8,6 +8,6 @@ - + diff --git a/src/Shared/Buffers.MemoryPool/Directory.Build.props b/src/Shared/Buffers.MemoryPool/Directory.Build.props deleted file mode 100644 index 953d072a5a..0000000000 --- a/src/Shared/Buffers.MemoryPool/Directory.Build.props +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - Microsoft.Extensions.Buffers.MemoryPool.Sources - - diff --git a/src/Shared/Buffers.Testing/Directory.Build.props b/src/Shared/Buffers.Testing/Directory.Build.props deleted file mode 100644 index 28a720c945..0000000000 --- a/src/Shared/Buffers.Testing/Directory.Build.props +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - Microsoft.Extensions.Buffers.Testing.Sources - - diff --git a/src/SignalR/Directory.Build.props b/src/SignalR/Directory.Build.props index 46b7ecc334..d17575850a 100644 --- a/src/SignalR/Directory.Build.props +++ b/src/SignalR/Directory.Build.props @@ -20,6 +20,6 @@ - + diff --git a/src/SignalR/clients/java/signalr/signalr.javaproj b/src/SignalR/clients/java/signalr/signalr.javaproj index 3cbe6887b3..f68799cc1c 100644 --- a/src/SignalR/clients/java/signalr/signalr.javaproj +++ b/src/SignalR/clients/java/signalr/signalr.javaproj @@ -52,22 +52,5 @@ - - - - JavaJar - $(PackageVersion) - ship - true - $(JarSigningCertName) - - - MavenPOM - $(PackageVersion) - ship - - - - 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 433ef5cd6e..a8ca3e302a 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": "1.1.0-rtm-t000", + "version": "3.0.0-preview-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 ef2b30a969..6d2f625d16 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": "1.1.0-rtm-t000", + "version": "3.0.0-preview-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 1f09c86a5b..74adbdddd1 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": "1.1.0-rtm-t000", + "version": "3.0.0-preview-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 f73bdfd448..83acbb358a 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": "1.1.0-rtm-t000", + "version": "3.0.0-preview-t000", "description": "ASP.NET Core SignalR Client", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.js", diff --git a/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj b/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj index f5bffd73e1..03d5f168e4 100644 --- a/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj +++ b/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj @@ -13,6 +13,9 @@ false false content + + + false @@ -24,17 +27,13 @@ - - + @@ -42,7 +41,6 @@ - diff --git a/src/SiteExtensions/LoggingBranch/Directory.Build.props b/src/SiteExtensions/LoggingBranch/Directory.Build.props deleted file mode 100644 index be2a21d512..0000000000 --- a/src/SiteExtensions/LoggingBranch/Directory.Build.props +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - $(RestoreSources); - $(ArtifactsConfigurationDir)$(SharedFxRid) - - - - diff --git a/src/SiteExtensions/LoggingBranch/Directory.Build.targets b/src/SiteExtensions/LoggingBranch/Directory.Build.targets index df33ae31f1..a7f5c19852 100644 --- a/src/SiteExtensions/LoggingBranch/Directory.Build.targets +++ b/src/SiteExtensions/LoggingBranch/Directory.Build.targets @@ -20,14 +20,4 @@ false - - - - NuGetPackage - $(PackageId) - $(PackageVersion) - - - - diff --git a/src/SiteExtensions/Microsoft.Web.Xdt.Extensions/src/Microsoft.Web.Xdt.Extensions.csproj b/src/SiteExtensions/Microsoft.Web.Xdt.Extensions/src/Microsoft.Web.Xdt.Extensions.csproj index 170d75c0bd..dc4978a635 100644 --- a/src/SiteExtensions/Microsoft.Web.Xdt.Extensions/src/Microsoft.Web.Xdt.Extensions.csproj +++ b/src/SiteExtensions/Microsoft.Web.Xdt.Extensions/src/Microsoft.Web.Xdt.Extensions.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/SiteExtensions/Runtime/Directory.Build.targets b/src/SiteExtensions/Runtime/Directory.Build.targets index b51869bb9e..75048f1a9c 100644 --- a/src/SiteExtensions/Runtime/Directory.Build.targets +++ b/src/SiteExtensions/Runtime/Directory.Build.targets @@ -20,16 +20,6 @@ - - - - NuGetPackage - $(PackageId) - $(PackageVersion) - - - - diff --git a/src/SiteExtensions/Sdk/HostingStartup/HostingStartup.csproj b/src/SiteExtensions/Sdk/HostingStartup/HostingStartup.csproj index be2bed7fc8..6faa3b0919 100644 --- a/src/SiteExtensions/Sdk/HostingStartup/HostingStartup.csproj +++ b/src/SiteExtensions/Sdk/HostingStartup/HostingStartup.csproj @@ -3,6 +3,7 @@ netcoreapp3.0 Exe + true diff --git a/src/SiteExtensions/Sdk/SiteExtension.targets b/src/SiteExtensions/Sdk/SiteExtension.targets index c7627c3012..0a027b15bc 100644 --- a/src/SiteExtensions/Sdk/SiteExtension.targets +++ b/src/SiteExtensions/Sdk/SiteExtension.targets @@ -14,6 +14,11 @@ <_BasePackagePath>content\additionaldeps\ <_RuntimeStoreManifestFile>$(_DepsOutputDirectory)\rs.csproj <_RuntimeStoreOutput>$(_DepsOutputDirectory)\rs\ + <_RsRestoreSources> + $(RestoreSources); + $(ArtifactsShippingPackagesDir); + $(ArtifactsNonShippingPackagesDir) + @@ -55,7 +60,14 @@ + Properties=" + TargetFramework=%(HostingStartupRuntimeStoreTargets.Identity); + RuntimeFrameworkVersion=$(HostingStartupRuntimeFrameworkVersion); + RuntimeIdentifier=%(HostingStartupRuntimeStoreTargets.Runtime); + ComposeDir=$(_RuntimeStoreOutput)\%(HostingStartupRuntimeStoreTargets.Runtime); + SkipOptimization=true; + DisablePackageReferenceRestrictions=true; + RestoreSources=$(_RsRestoreSources)" /> @@ -63,11 +75,27 @@ + Properties=" + __DummyTarget=Restore; + HostingStartupPackageName=%(_HostingStartupPackageReference.Identity); + HostingStartupPackageVersion=%(_HostingStartupPackageReference.Version); + RuntimeFrameworkVersion=$(HostingStartupRuntimeFrameworkVersion); + MicrosoftAspNetCoreAppPackageVersion=$(MicrosoftAspNetCoreAppPackageVersion); + UseAppHost=false; + NoBuild=false; + RestoreSources=$(_RsRestoreSources)" /> + Properties=" + PublishDir=%(_HostingStartupPackageReference.WorkingDirectory)\p; + HostingStartupPackageName=%(_HostingStartupPackageReference.Identity); + HostingStartupPackageVersion=%(_HostingStartupPackageReference.Version); + RuntimeFrameworkVersion=$(HostingStartupRuntimeFrameworkVersion); + MicrosoftAspNetCoreAppPackageVersion=$(MicrosoftAspNetCoreAppPackageVersion); + UseAppHost=false; + NoBuild=false; + IncludeMainProjectInDepsFile=false" /> diff --git a/src/Tools/FirstRunCertGenerator/src/Microsoft.AspNetCore.DeveloperCertificates.XPlat.csproj b/src/Tools/FirstRunCertGenerator/src/Microsoft.AspNetCore.DeveloperCertificates.XPlat.csproj index 65d2840c3f..3faa423994 100644 --- a/src/Tools/FirstRunCertGenerator/src/Microsoft.AspNetCore.DeveloperCertificates.XPlat.csproj +++ b/src/Tools/FirstRunCertGenerator/src/Microsoft.AspNetCore.DeveloperCertificates.XPlat.csproj @@ -5,6 +5,9 @@ Package for the CLI first run experience. $(DefineConstants);XPLAT aspnet;cli + + + false 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 39b08b71a1..17f66f648f 100644 --- a/src/Tools/dotnet-dev-certs/src/dotnet-dev-certs.csproj +++ b/src/Tools/dotnet-dev-certs/src/dotnet-dev-certs.csproj @@ -9,6 +9,8 @@ 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 239e4195a1..4cf4de7e73 100644 --- a/src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj +++ b/src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj @@ -8,6 +8,8 @@ true win-x64;win-x86 + + false @@ -19,12 +21,4 @@ - - - - - - - - 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 0bab8e1a92..f6efc9968c 100644 --- a/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj +++ b/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj @@ -10,6 +10,8 @@ true win-x64;win-x86 + + false @@ -22,21 +24,4 @@ - - - - - - - - - - - - - - - - - diff --git a/src/Tools/dotnet-watch/src/dotnet-watch.csproj b/src/Tools/dotnet-watch/src/dotnet-watch.csproj index a0b3e1cff5..dd95251e1d 100644 --- a/src/Tools/dotnet-watch/src/dotnet-watch.csproj +++ b/src/Tools/dotnet-watch/src/dotnet-watch.csproj @@ -9,6 +9,8 @@ true win-x64;win-x86 + + false @@ -18,7 +20,7 @@ - +