diff --git a/.azure/pipelines/fast-pr-validation.yml b/.azure/pipelines/fast-pr-validation.yml
index fbe84b0800..56dd12ecd7 100644
--- a/.azure/pipelines/fast-pr-validation.yml
+++ b/.azure/pipelines/fast-pr-validation.yml
@@ -3,9 +3,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/.gitignore b/.gitignore
index ba949609e0..4053f67f62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ msbuild.ProjectImports.zip
scripts/tmp/
.dotnet/
.tools/
+src/**/global.json
diff --git a/build/Publish.targets b/build/Publish.targets
index 0a7c35caa5..0795f9397e 100644
--- a/build/Publish.targets
+++ b/build/Publish.targets
@@ -64,7 +64,6 @@
aspnetcore/npm/
aspnetcore/jar/
aspnetcore/Runtime/$(SharedFxCliBlobChannel)/
- runtime-site-extension-internal-$(PackageVersion).zip
aspnetcore-runtime-$(PackageVersion)
aspnetcore-runtime-latest
aspnetcore-runtime-internal-$(PackageVersion)
@@ -95,11 +94,6 @@
-
- $(BlobBasePath)$(SiteExtensionArchiveFileName)
- ShipInstaller=dotnetcli
-
-
$(BlobBasePath)nuGetPackagesArchive-$(PackageVersion).lzma
ShipInstaller=dotnetcli
diff --git a/build/RepositoryBuild.targets b/build/RepositoryBuild.targets
index c6adf74217..6a14264dca 100644
--- a/build/RepositoryBuild.targets
+++ b/build/RepositoryBuild.targets
@@ -77,6 +77,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 1939ecb1a7..3ee7ccff69 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 d254b97717..0af670e128 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -105,6 +105,7 @@
+
diff --git a/build/repo.props b/build/repo.props
index 123194e88f..bdf4c80e1a 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -13,6 +13,11 @@
$(RepositoryRoot).deps\build\
$(RepositoryRoot).deps\Signed\Packages\
+
+ true
+ $(RepositoryRoot)eng\signcheck.exclusions.txt
+
+ true
diff --git a/eng/signcheck.exclusions.txt b/eng/signcheck.exclusions.txt
new file mode 100644
index 0000000000..72a47fb4ba
--- /dev/null
+++ b/eng/signcheck.exclusions.txt
@@ -0,0 +1,5 @@
+content/sdk/*/AppHostTemplate/apphost.exe;AspNetCoreRuntime.*.nupkg; Exclude the apphost because this is expected to be code-signed by customers after the SDK modifies it.
+content/*.js;Microsoft.DotNet.Web.Spa.ProjectTemplates.*.nupkg; Exclude JavaScript files from codesigning in project templates
+content/*.js;Microsoft.DotNet.Web.ProjectTemplates.*.nupkg; Exclude JavaScript files from codesigning in project templates
+Templates/*.js;Microsoft.VisualStudio.Web.CodeGenerators.Mvc.*.nupkg; Exclude JavaScript files from codesigning in code generators
+*.js;signalr-*-javadoc.jar; Exclude JavaScript files in the generated javadocs
diff --git a/src/DataProtection/Directory.Build.props b/src/DataProtection/Directory.Build.props
index d665878225..4a6e505662 100644
--- a/src/DataProtection/Directory.Build.props
+++ b/src/DataProtection/Directory.Build.props
@@ -8,11 +8,6 @@
-
-
-
- false
-
diff --git a/src/DataProtection/dependencies.props b/src/DataProtection/dependencies.props
deleted file mode 100644
index 6633853e15..0000000000
--- a/src/DataProtection/dependencies.props
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
- $(MSBuildAllProjects);$(MSBuildThisFileFullPath)
-
-
-
-
- 2.2.0-preview2-20181004.6
- 3.0.0-alpha1-10584
- $(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 71a78cddd8..1f8b85dec9 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/Framework/Directory.Build.props b/src/Framework/Directory.Build.props
index 5e777f75d6..d04c942d21 100644
--- a/src/Framework/Directory.Build.props
+++ b/src/Framework/Directory.Build.props
@@ -15,7 +15,7 @@
- $(ArtifactsConfigurationDir)$(SharedFxRid)\$(MSBuildProjectName)\
+ $(RepositoryRoot)bin\fx\$(SharedFxRid)\$(MSBuildProjectName)\
$(RepositoryRoot)obj\fx\$(MSBuildProjectName)\
false
diff --git a/src/IISIntegration/Directory.Build.props b/src/IISIntegration/Directory.Build.props
index 45a38d3e61..82bbde4ef9 100644
--- a/src/IISIntegration/Directory.Build.props
+++ b/src/IISIntegration/Directory.Build.props
@@ -1,20 +1,11 @@
-
+
+
-
-
+
- Microsoft ASP.NET Core
- https://github.com/aspnet/IISIntegration
- git
- $(MSBuildThisFileDirectory)
- $(MSBuildThisFileDirectory)build\Key.snk
- true
- true
false
diff --git a/src/IISIntegration/Directory.Build.targets b/src/IISIntegration/Directory.Build.targets
deleted file mode 100644
index 8147ccfa6e..0000000000
--- a/src/IISIntegration/Directory.Build.targets
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- $(MicrosoftNETCoreApp21PackageVersion)
- $(MicrosoftNETCoreApp22PackageVersion)
- $(NETStandardLibrary20PackageVersion)
-
-
diff --git a/src/IISIntegration/IISIntegration.NoV1.sln b/src/IISIntegration/IISIntegration.NoV1.sln
index f7eb135f73..e0e3d4967e 100644
--- a/src/IISIntegration/IISIntegration.NoV1.sln
+++ b/src/IISIntegration/IISIntegration.NoV1.sln
@@ -45,7 +45,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7E80C58E
build\native.targets = build\native.targets
build\repo.props = build\repo.props
build\repo.targets = build\repo.targets
- build\sources.props = build\sources.props
build\testsite.props = build\testsite.props
EndProjectSection
EndProject
diff --git a/src/IISIntegration/IISIntegration.sln b/src/IISIntegration/IISIntegration.sln
index 440001a8ac..74e2591646 100644
--- a/src/IISIntegration/IISIntegration.sln
+++ b/src/IISIntegration/IISIntegration.sln
@@ -46,7 +46,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7E80C58E
build\native.targets = build\native.targets
build\repo.props = build\repo.props
build\repo.targets = build\repo.targets
- build\sources.props = build\sources.props
build\testsite.props = build\testsite.props
EndProjectSection
EndProject
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 5686841850..0000000000
--- a/src/IISIntegration/build/dependencies.props
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
- $(MSBuildAllProjects);$(MSBuildThisFileFullPath)
-
-
- 0.10.13
- 3.0.0-alpha1-20181011.11
- 3.0.0-alpha1-10657
- 3.0.0-alpha1-10657
- 3.0.0-alpha1-10657
- 3.0.0-alpha1-10657
- 3.0.0-alpha1-10657
- 3.0.0-alpha1-10657
- 3.0.0-alpha1-10657
- 3.0.0-alpha1-10657
- 3.0.0-alpha1-10657
- 3.0.0-alpha1-10657
- 3.0.0-alpha1-10657
- 0.7.0-alpha1-10657
- 3.0.0-alpha1-10657
- 3.0.0-alpha1-10657
- 3.0.0-alpha1-10657
- 3.0.0-alpha1-10657
- 15.8.166
- 15.8.166
- 3.0.0-alpha1-10657
- 3.0.0-alpha1-10657
- 3.0.0-alpha1-10657
- 3.0.0-alpha1-10657
- 3.0.0-alpha1-10657
- 3.0.0-alpha1-10657
- 3.0.0-alpha1-10657
- 3.0.0-alpha1-10657
- 3.0.0-alpha1-10657
- 3.0.0-alpha1-10657
- 2.0.9
- 2.1.3
- 2.2.0-preview3-27014-02
- 1.0.1
- 3.0.0-alpha1-10657
- 15.6.1
- 11.1.0
- 2.0.3
- 4.6.0-preview1-26907-04
- 4.6.0-preview1-26907-04
- 4.6.0-preview1-26907-04
- 4.6.0-preview1-26717-04
- 4.6.0-preview1-26907-04
- 4.6.0-preview1-26907-04
- 4.6.0-preview1-26907-04
- 4.6.0-preview1-26907-04
- 4.6.0-preview1-26907-04
- 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 22ce288253..44da1e6bcb 100644
--- a/src/IISIntegration/build/repo.props
+++ b/src/IISIntegration/build/repo.props
@@ -1,8 +1,10 @@
-
-
+
+
- $(BuildDir)AspNetCoreModule.zip
+
+ true
+
$(BuildDir)StressTestWebSite.zip
@@ -28,17 +30,4 @@
-
-
-
- Internal.AspNetCore.Universe.Lineup
- https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json
-
-
-
-
-
-
-
-
diff --git a/src/IISIntegration/build/repo.targets b/src/IISIntegration/build/repo.targets
index 51fae5d588..341ae8b7f5 100644
--- a/src/IISIntegration/build/repo.targets
+++ b/src/IISIntegration/build/repo.targets
@@ -4,7 +4,7 @@
$(PrepareDependsOn)
$(GetArtifactInfoDependsOn);GetNativeArtifactsInfo
BuildNativeAssets;$(CompileDependsOn)
- $(PackageDependsOn);PackageNativeProjects;PackageStressTestApp
+ $(PackageDependsOn);PackageNativeProjects
$(TestDependsOn);RunNativeTest
$(RepositoryRoot)NuGetPackageVerifier.xplat.json
$(RepositoryRoot)src\
@@ -58,13 +58,6 @@
-
- ZipArchive
- $(RepositoryRoot)
- noship
-
-
-
diff --git a/src/IISIntegration/build/sources.props b/src/IISIntegration/build/sources.props
deleted file mode 100644
index 9215df9751..0000000000
--- a/src/IISIntegration/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;
-
-
-
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/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 adb9762301..26703bffbe 100644
--- a/src/IISIntegration/version.props
+++ b/src/IISIntegration/version.props
@@ -12,8 +12,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 6707751581..0000000000
--- a/src/WebSockets/Directory.Build.targets
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- $(MicrosoftNETCoreApp20PackageVersion)
- $(MicrosoftNETCoreApp21PackageVersion)
- $(MicrosoftNETCoreApp22PackageVersion)
- $(NETStandardLibrary20PackageVersion)
-
-
diff --git a/src/WebSockets/build/dependencies.props b/src/WebSockets/build/dependencies.props
deleted file mode 100644
index 6cbe390992..0000000000
--- a/src/WebSockets/build/dependencies.props
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
- $(MSBuildAllProjects);$(MSBuildThisFileFullPath)
-
-
- 3.0.0-alpha1-20181004.7
- 3.0.0-alpha1-10584
- 3.0.0-alpha1-10584
- 3.0.0-alpha1-10584
- 3.0.0-alpha1-10584
- 3.0.0-alpha1-10584
- 0.7.0-alpha1-10584
- 3.0.0-alpha1-10584
- 3.0.0-alpha1-10584
- 3.0.0-alpha1-10584
- 3.0.0-alpha1-10584
- 3.0.0-alpha1-10584
- 3.0.0-alpha1-10584
- 3.0.0-alpha1-10584
- 3.0.0-alpha1-10584
- 3.0.0-alpha1-10584
- 3.0.0-alpha1-10584
- 2.0.9
- 2.1.3
- 2.2.0-preview2-26905-02
- 15.6.1
- 2.0.3
- 4.6.0-preview1-26907-04
- 2.3.1
- 2.4.0
-
-
-
-
diff --git a/src/WebSockets/build/repo.props b/src/WebSockets/build/repo.props
index dbb6943347..ad95e1570f 100644
--- a/src/WebSockets/build/repo.props
+++ b/src/WebSockets/build/repo.props
@@ -1,18 +1,12 @@
-
+
+
+
+
+ true
+
-
-
- Internal.AspNetCore.Universe.Lineup
- 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;
-
-
-