diff --git a/.azure/pipelines/fast-pr-validation.yml b/.azure/pipelines/fast-pr-validation.yml index 143abd2e46..8da4603d26 100644 --- a/.azure/pipelines/fast-pr-validation.yml +++ b/.azure/pipelines/fast-pr-validation.yml @@ -4,9 +4,22 @@ trigger: - release/* jobs: -- template: project-ci.yml +- template: jobs/default-build.yml parameters: + agentOs: Windows + jobName: Windows_FastCheck + jobDisplayName: Windows - Fast Check buildArgs: "/t:FastCheck" + artifacts: + publish: false +- template: jobs/default-build.yml + parameters: + agentOs: Windows + jobName: Compile_Windows + jobDisplayName: "Build: Windows" + buildArgs: "/p:SkipTests=true" + artifacts: + publish: false - job: RepoBuilds pool: vmImage: vs2017-win2016 diff --git a/.azure/pipelines/project-ci.yml b/.azure/pipelines/project-ci.yml deleted file mode 100644 index c08991dfc4..0000000000 --- a/.azure/pipelines/project-ci.yml +++ /dev/null @@ -1,60 +0,0 @@ -# Description: Runs build.cmd/sh on macOS, Linux, and Windows -# Parameters: -# buildArgs: string -# Additional arguments to pass to the build.sh/cmd script. -# Note: -ci is always passed -# beforeBuild: [steps] -# Additional steps to run before build.sh/cmd -# afterBuild: [steps] -# Additional steps to run after build.sh/cmd -# variables: {} -# VSTS build and environment variables -# matrix: {} -# The matrix of configurations to run. By default, it runs a Debug and Release build on all platforms -# codeSign: boolean -# This build definition is enabled for code signing. (Only applies to Windows) -# buildDirectory: string -# Specifies what directory to run build.sh/cmd - -parameters: - buildArgs: '' - beforeBuild: [] - afterBuild: [] - codeSign: false - variables: {} - matrix: - Release: - BuildConfiguration: Release - Debug: - BuildConfiguration: Debug - buildDirectory: '' - -jobs: -- template: jobs/default-build.yml - parameters: - agentOs: Windows - matrix: ${{ parameters.matrix }} - buildArgs: ${{ parameters.buildArgs }} - beforeBuild: ${{ parameters.beforeBuild }} - afterBuild: ${{ parameters.afterBuild }} - codeSign: ${{ parameters.codeSign }} - variables: ${{ parameters.variables }} - buildDirectory: ${{ parameters.buildDirectory }} -- template: jobs/default-build.yml - parameters: - agentOs: macOS - matrix: ${{ parameters.matrix }} - buildArgs: ${{ parameters.buildArgs }} - beforeBuild: ${{ parameters.beforeBuild }} - afterBuild: ${{ parameters.afterBuild }} - variables: ${{ parameters.variables }} - buildDirectory: ${{ parameters.buildDirectory }} -- template: jobs/default-build.yml - parameters: - agentOs: Linux - matrix: ${{ parameters.matrix }} - buildArgs: ${{ parameters.buildArgs }} - beforeBuild: ${{ parameters.beforeBuild }} - afterBuild: ${{ parameters.afterBuild }} - variables: ${{ parameters.variables }} - buildDirectory: ${{ parameters.buildDirectory }} diff --git a/build/RepositoryBuild.targets b/build/RepositoryBuild.targets index f3c6920044..a9af6ff519 100644 --- a/build/RepositoryBuild.targets +++ b/build/RepositoryBuild.targets @@ -78,6 +78,7 @@ $(RepositoryBuildArguments) -DotNetHome '$(DOTNET_HOME)' $(RepositoryBuildArguments) /p:AspNetUniverseBuildOffline=true + $(RepositoryBuildArguments) /p:IsUniverseBuild=true $(RepositoryBuildArguments) /p:DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath) $(RepositoryBuildArguments) /p:DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath) diff --git a/build/buildorder.props b/build/buildorder.props index a22e5179b8..c17c8d0952 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -7,9 +7,9 @@ - - - + + + diff --git a/build/dependencies.folderbuilds.props b/build/dependencies.folderbuilds.props new file mode 100644 index 0000000000..e027154252 --- /dev/null +++ b/build/dependencies.folderbuilds.props @@ -0,0 +1,29 @@ + + + + 2.2.0-preview2-20181108.4 + 2.2.0-rtm-35665 + 2.2.0-rtm-35665 + 2.2.0-rtm-35665 + 2.2.0-rtm-35665 + 2.2.0-rtm-35665 + 2.2.0-rtm-35665 + 2.2.0-rtm-35665 + 2.2.0-rtm-35665 + 2.2.0-rtm-35665 + 2.2.0-rtm-35665 + 2.2.0-rtm-35665 + 2.2.0-rtm-35665 + 2.2.0-rtm-35665 + 0.6.0-rtm-35665 + 2.2.0-rtm-35665 + 2.2.0-rtm-35665 + 2.2.0-rtm-35665 + 2.2.0-rtm-35665 + 2.2.0-rtm-35665 + 2.2.0-rtm-35665 + 2.2.0-rtm-35665 + 2.2.0-rtm-35665 + 2.2.0-rtm-35665 + + diff --git a/build/dependencies.props b/build/dependencies.props index 95a52d4b9e..0d6109cbeb 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -70,6 +70,7 @@ + diff --git a/src/DataProtection/Directory.Build.props b/src/DataProtection/Directory.Build.props index b18bd3713f..dc0f2fb7d4 100644 --- a/src/DataProtection/Directory.Build.props +++ b/src/DataProtection/Directory.Build.props @@ -3,11 +3,6 @@ - - - - false - diff --git a/src/DataProtection/dependencies.props b/src/DataProtection/dependencies.props deleted file mode 100644 index 687186b112..0000000000 --- a/src/DataProtection/dependencies.props +++ /dev/null @@ -1,33 +0,0 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - - - 2.2.0-preview2-20181004.6 - 2.2.0-preview3-35497 - $(LastGoodAspBuildVersion) - $(LastGoodAspBuildVersion) - $(LastGoodAspBuildVersion) - $(LastGoodAspBuildVersion) - $(LastGoodAspBuildVersion) - $(LastGoodAspBuildVersion) - $(LastGoodAspBuildVersion) - $(LastGoodAspBuildVersion) - $(LastGoodAspBuildVersion) - $(LastGoodAspBuildVersion) - $(LastGoodAspBuildVersion) - $(LastGoodAspBuildVersion) - $(LastGoodAspBuildVersion) - $(LastGoodAspBuildVersion) - $(LastGoodAspBuildVersion) - - - - - - diff --git a/src/DataProtection/version.props b/src/DataProtection/version.props index 4889a26987..6d48efec5b 100644 --- a/src/DataProtection/version.props +++ b/src/DataProtection/version.props @@ -5,8 +5,6 @@ $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final t000 - a- - $(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-')) $(VersionSuffix)-$(BuildNumber) diff --git a/src/IISIntegration/Directory.Build.props b/src/IISIntegration/Directory.Build.props index 7c0a39562a..82bbde4ef9 100644 --- a/src/IISIntegration/Directory.Build.props +++ b/src/IISIntegration/Directory.Build.props @@ -3,7 +3,7 @@ - + diff --git a/src/IISIntegration/Directory.Build.targets b/src/IISIntegration/Directory.Build.targets deleted file mode 100644 index 73b97f2807..0000000000 --- a/src/IISIntegration/Directory.Build.targets +++ /dev/null @@ -1,9 +0,0 @@ - - - $(MicrosoftNETCoreApp21PackageVersion) - $(MicrosoftNETCoreApp22PackageVersion) - $(NETStandardLibrary20PackageVersion) - - 99.9 - - diff --git a/src/IISIntegration/build.sh b/src/IISIntegration/build.sh old mode 100644 new mode 100755 diff --git a/src/IISIntegration/build/dependencies.props b/src/IISIntegration/build/dependencies.props deleted file mode 100644 index 2f9ebbca5b..0000000000 --- a/src/IISIntegration/build/dependencies.props +++ /dev/null @@ -1,68 +0,0 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - 0.10.13 - 2.2.0-preview2-20181019.5 - 2.2.0-rtm-35541 - 2.2.0-rtm-35541 - 2.2.0-rtm-35541 - 2.2.0-rtm-35541 - 2.2.0-rtm-35541 - 2.2.0-rtm-35541 - 2.2.0-rtm-35541 - 2.2.0-rtm-35541 - 2.2.0-rtm-35541 - 2.2.0-rtm-35541 - 2.2.0-rtm-35541 - 0.6.0-rtm-35541 - 2.2.0-rtm-35541 - 2.2.0-rtm-35541 - 2.2.0-rtm-35541 - 2.2.0-rtm-35541 - 15.6.82 - 15.6.82 - 2.2.0-rtm-35541 - 2.2.0-rtm-35541 - 2.2.0-rtm-35541 - 2.2.0-rtm-35541 - 2.2.0-rtm-35541 - 2.2.0-rtm-35541 - 2.2.0-rtm-35541 - 2.2.0-rtm-35541 - 2.2.0-rtm-35541 - 2.2.0-rtm-35541 - 2.1.3 - 2.2.0-rtm-27023-02 - 1.0.1 - 2.2.0-rtm-35541 - 15.6.1 - 11.1.0 - 2.0.3 - 4.5.0 - 4.5.0 - 4.5.2 - 4.5.1 - 4.5.1 - 4.5.0 - 4.5.1 - 4.5.0 - 4.5.0 - 9.0.1 - 2.3.1 - 2.4.0 - - - - 2.2.0-preview3-35497 - 2.2.0-preview3-35497 - 2.2.0-preview3-35497 - 2.1.0 - 2.1.0 - 2.1.0 - 2.1.0 - 4.5.2 - 4.5.0 - - diff --git a/src/IISIntegration/build/repo.props b/src/IISIntegration/build/repo.props index b75afd2b3c..a4ed9c2f43 100644 --- a/src/IISIntegration/build/repo.props +++ b/src/IISIntegration/build/repo.props @@ -1,7 +1,10 @@ - - + + + + true + $(BuildDir)StressTestWebSite.zip @@ -26,18 +29,4 @@ - - - - Internal.AspNetCore.Universe.Lineup - 2.2.0-* - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json - - - - - - - - diff --git a/src/IISIntegration/dependencies.overrides.props b/src/IISIntegration/dependencies.overrides.props new file mode 100644 index 0000000000..8fa5d9fc58 --- /dev/null +++ b/src/IISIntegration/dependencies.overrides.props @@ -0,0 +1,19 @@ + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + + 2.2.0-rtm-35665 + 2.2.0-rtm-35665 + 2.2.0-rtm-35665 + 2.1.0 + 2.1.0 + 2.1.0 + 2.1.0 + 4.5.2 + 4.5.0 + + + + diff --git a/src/IISIntegration/src/IISIntegration/test/TestTasks/TestTasks.csproj b/src/IISIntegration/src/IISIntegration/test/TestTasks/TestTasks.csproj index aa4c144936..3cf4f265bb 100644 --- a/src/IISIntegration/src/IISIntegration/test/TestTasks/TestTasks.csproj +++ b/src/IISIntegration/src/IISIntegration/test/TestTasks/TestTasks.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/IISIntegration/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj b/src/IISIntegration/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj index 4d0952108a..e08c2be69f 100644 --- a/src/IISIntegration/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj +++ b/src/IISIntegration/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj @@ -21,7 +21,6 @@ - diff --git a/src/IISIntegration/test/TestTasks/TestTasks.csproj b/src/IISIntegration/test/TestTasks/TestTasks.csproj index aa4c144936..3cf4f265bb 100644 --- a/src/IISIntegration/test/TestTasks/TestTasks.csproj +++ b/src/IISIntegration/test/TestTasks/TestTasks.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj b/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj index 4d0952108a..e08c2be69f 100644 --- a/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj +++ b/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj @@ -21,7 +21,6 @@ - diff --git a/src/IISIntegration/version.props b/src/IISIntegration/version.props index 6fb4839c0d..9b96613b4a 100644 --- a/src/IISIntegration/version.props +++ b/src/IISIntegration/version.props @@ -13,8 +13,6 @@ $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final t000 - a- - $(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-')) $(VersionSuffix)-$(BuildNumber) 2.0.0 diff --git a/src/WebSockets/Directory.Build.props b/src/WebSockets/Directory.Build.props index 08744cc42e..97bc856e11 100644 --- a/src/WebSockets/Directory.Build.props +++ b/src/WebSockets/Directory.Build.props @@ -1,19 +1,5 @@  - + - - - - - Microsoft ASP.NET Core - https://github.com/aspnet/WebSockets - git - $(MSBuildThisFileDirectory) - $(MSBuildThisFileDirectory)build\Key.snk - true - true - diff --git a/src/WebSockets/Directory.Build.targets b/src/WebSockets/Directory.Build.targets deleted file mode 100644 index 78626b773e..0000000000 --- a/src/WebSockets/Directory.Build.targets +++ /dev/null @@ -1,10 +0,0 @@ - - - $(MicrosoftNETCoreApp20PackageVersion) - $(MicrosoftNETCoreApp21PackageVersion) - $(MicrosoftNETCoreApp22PackageVersion) - $(NETStandardLibrary20PackageVersion) - - 99.9 - - diff --git a/src/WebSockets/build/dependencies.props b/src/WebSockets/build/dependencies.props deleted file mode 100644 index 6a1e9ab585..0000000000 --- a/src/WebSockets/build/dependencies.props +++ /dev/null @@ -1,34 +0,0 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - 2.2.0-preview2-20181004.6 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 0.6.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.0.9 - 2.1.3 - 2.2.0-preview3-27001-02 - 15.6.1 - 2.0.3 - 4.5.1 - 2.3.1 - 2.4.0 - - - - diff --git a/src/WebSockets/build/repo.props b/src/WebSockets/build/repo.props index feea5ac9e6..ad95e1570f 100644 --- a/src/WebSockets/build/repo.props +++ b/src/WebSockets/build/repo.props @@ -1,19 +1,12 @@ - + + + + + true + - - - Internal.AspNetCore.Universe.Lineup - 2.2.0-* - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json - - - - - - - diff --git a/src/WebSockets/build/sources.props b/src/WebSockets/build/sources.props deleted file mode 100644 index 9215df9751..0000000000 --- a/src/WebSockets/build/sources.props +++ /dev/null @@ -1,17 +0,0 @@ - - - - - $(DotNetRestoreSources) - - $(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; - - - $(RestoreSources); - https://api.nuget.org/v3/index.json; - - -