Skip to content

Add AspNetCore #1144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 176 commits into from
Aug 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
176 commits
Select commit Hold shift + click to select a range
bfa9f63
Update to initial preview7 manifest.
crummel Jul 15, 2019
69f8025
Fix hashes for Linker and core-setup.
crummel Jul 15, 2019
2d2f8c9
Remove some patches.
crummel Jul 15, 2019
1aebeb0
Update Arcade SDK version.
crummel Jul 15, 2019
53f69ff
More patch removal.
crummel Jul 15, 2019
640dab6
More patch updates.
crummel Jul 15, 2019
f6768f8
More patch updates.
crummel Jul 15, 2019
1b9ddcd
More patch removal.
crummel Jul 15, 2019
bd70d9d
Remove Roslyn patches.
crummel Jul 15, 2019
26d6235
Reconfigure Roslyn patch.
crummel Jul 15, 2019
9fa1f1f
Remove unneeded project.
crummel Jul 16, 2019
c7dc7c7
Use Dan's patch to fix missing DiaSymReader error.
crummel Jul 16, 2019
454db54
Patch out fullfx in Roslyn.
crummel Jul 16, 2019
f041446
Fix duplicate patches.
crummel Jul 16, 2019
c133bdd
Initial add of AspNetCore.
crummel Jul 16, 2019
aeb4d78
Don't need this package?
crummel Jul 17, 2019
e35c372
Patch in another needed feed.
crummel Jul 17, 2019
65ea669
Update coreclr to use 3.0 SDK
dseefeld Jul 17, 2019
5c0ad8f
Merge branch 'release/3.0' into update-3.0-preview7
dseefeld Jul 17, 2019
3deed54
Remove redundant roslyn patch
dseefeld Jul 17, 2019
bd4c18a
Alternate RestoreSources method.
crummel Jul 17, 2019
0189f4d
Update docker images for CI to latest versions
dseefeld Jul 17, 2019
4150048
Remove hopefully unneeded Debian workaround.
crummel Jul 17, 2019
2df5ce9
Update 3.0 preview SDK.
crummel Jul 17, 2019
f598268
Don't need nodereuse=false here?
crummel Jul 17, 2019
271b73a
Patch CoreCLR to ignore warnigs from new SDK.
crummel Jul 17, 2019
3856058
Port some changes from CoreCLR update.
crummel Jul 17, 2019
9ae6280
Add Yarn for AspNetCore.
crummel Jul 17, 2019
88bae56
Add CoreCLR PGO debug patch.
crummel Jul 17, 2019
cf8d4c8
A couple more extra feeds.
crummel Jul 17, 2019
94f63ef
Fix typo in patch.
crummel Jul 17, 2019
6277562
Try bringing forward a couple patches from previous CoreCLR branch.
crummel Jul 17, 2019
1354518
Add patch for using old Nullable property name in CoreCLR.
crummel Jul 17, 2019
256b1f0
Add PackageVersions.props import patch to AspNetCore.
crummel Jul 17, 2019
cde5a71
Back to PGO debugging.
crummel Jul 17, 2019
d1e9022
Try better version stamp?
crummel Jul 17, 2019
cdb6cd3
Patch AspNetCore to remove some projects.
crummel Jul 18, 2019
e99888b
Fix typo in patch.
crummel Jul 18, 2019
c0ea7b0
Try with old nullability method.
crummel Jul 18, 2019
48ef5e5
Attempt to set default for _SuppressSdkImports in AspNetCore.
crummel Jul 18, 2019
e3439b2
More nullable reversions.
crummel Jul 18, 2019
4191e46
More nullable reversions.
crummel Jul 18, 2019
de57426
Fix typo in patch.
crummel Jul 18, 2019
d0c8e20
Add Build.Traversal SDK override.
crummel Jul 18, 2019
6ca990e
Set PackagesDir for coreclr.
crummel Jul 18, 2019
0837b20
Add empty SourceLink target for CoreCLR.
crummel Jul 18, 2019
aba8b03
Add Arcade Configruation SDK to overrides.
crummel Jul 18, 2019
597d6f4
Don't use Directory.Build.props for source-build exclusions.
crummel Jul 18, 2019
a86f9e3
Configuration SDK in CoreFX.
crummel Jul 18, 2019
d15259d
Another SDK for CoreFX.
crummel Jul 18, 2019
8f814de
Patch out nullable in corefx.
crummel Jul 18, 2019
9202172
More CoreFX nullability.
crummel Jul 18, 2019
86fd0a3
Disable new nullable warning and more nullability.
crummel Jul 18, 2019
eee2642
Hopefully fix Windows CoreCLR issue.
crummel Jul 18, 2019
c22b051
Try windows without warnaserror=false.
crummel Jul 19, 2019
8978c17
More CoreFX nullable.
crummel Jul 19, 2019
a2df66c
Windows argument fixes?
crummel Jul 19, 2019
5f0c313
More nullability.
crummel Jul 19, 2019
fc7b0a3
Another Windows fix try
crummel Jul 19, 2019
fcaf6cb
Fix corefx patch
crummel Jul 19, 2019
affc775
More nullability.
crummel Jul 19, 2019
ccd9063
More nullable
crummel Jul 19, 2019
2fa2106
More nullability
crummel Jul 19, 2019
ce7d284
More nullable
crummel Jul 19, 2019
6e9c876
More nullable
crummel Jul 19, 2019
d6d4cd8
more nullable
crummel Jul 19, 2019
225bd7c
try a different approach
crummel Jul 19, 2019
f42cdf3
Update Arcade.
crummel Jul 19, 2019
733938c
Update Arcade patches
crummel Jul 19, 2019
f66876a
Try building corefx with separate roslyn
crummel Jul 19, 2019
9fa66b2
Pass intermediate path to CoreFX.
crummel Jul 19, 2019
8d02e5b
Revert "Try building corefx with separate roslyn"
crummel Jul 19, 2019
1b8eede
Add patch for more nullable warnings.
crummel Jul 19, 2019
22d1313
Remove CoreCLR nullability patch.
crummel Jul 19, 2019
7b798df
One more warning.
crummel Jul 19, 2019
055e67e
Remove bypass of toolset initialization - will probably break things,…
crummel Jul 19, 2019
ad81e1c
Revert "Remove CoreCLR nullability patch."
crummel Jul 19, 2019
19c6240
Add intermediate source path for corefx GenApi. Path is under
dseefeld Jul 20, 2019
4cdb1b1
Merge pull request #1 from crummel/addCorefxGenApiFix
crummel Jul 20, 2019
2bed94d
Roslyn only includes build.props for net472 builds.
crummel Jul 20, 2019
d0797c1
Patch roslyn to exclude DiaSymReader
crummel Jul 20, 2019
eebb402
Patch verbose flag into core-setup crossgen for debugging.
crummel Jul 20, 2019
dd10552
Patch core-setup to not do partial ngen.
crummel Jul 21, 2019
9bccc80
Skip symbol crossgen in core-setup.
crummel Jul 21, 2019
76a206c
Restore aspnet-extensions patch.
crummel Jul 21, 2019
2d2832c
Fix up patches.
crummel Jul 21, 2019
36ec681
Restore websdk PVP patch.
crummel Jul 21, 2019
7da248c
Add extra restore source to websdk.
crummel Jul 21, 2019
89d5ef4
Merge branch 'update-3.0-preview7' into addAspNetCore
crummel Jul 21, 2019
4a0dea6
Remove roslyn patch so build.props get included.
crummel Jul 22, 2019
2be1f0a
Port roslyn patch
crummel Jul 22, 2019
f0a5bfe
Merge remote-tracking branch 'origin/update-3.0-preview7' into addAsp…
crummel Jul 22, 2019
3a04839
Some dependency updates.
crummel Jul 22, 2019
0949905
Fix project name
crummel Jul 22, 2019
71aa9ca
Another restore source.
crummel Jul 22, 2019
7c6acf1
Remove analyzers for aspnetcore-tooling.
crummel Jul 22, 2019
2c0bd4e
Try ignoring the warning instead.
crummel Jul 23, 2019
397ceac
Merge remote-tracking branch 'upstream/release/3.0' into addAspNetCore
crummel Jul 25, 2019
70ea733
Merge cleanup
crummel Jul 25, 2019
8239b6e
Disable Analyzers to remove a prebuilt.
crummel Jul 26, 2019
6be4094
Try a different approach.
crummel Jul 26, 2019
8a492b9
Merge branch 'release/3.0' of work:dotnet/source-build into addAspNet…
crummel Jul 29, 2019
e22a5b8
Merge branch 'release/3.0' of work:dotnet/source-build into addAspNet…
crummel Jul 30, 2019
e116b27
Update to AspNetCore coherent with new preview7 versions.
crummel Jul 30, 2019
5d1f372
Try to knock a bunch of projects out at once.
crummel Jul 31, 2019
910d19c
fix patch
crummel Jul 31, 2019
3f6b42f
More test exclusions.
crummel Aug 1, 2019
51fc668
Initial preview8 update.
crummel Aug 1, 2019
7ec2e2e
Fix dependencies.props versions.
crummel Aug 2, 2019
6ae8a27
Update patches
crummel Aug 2, 2019
bdcad3e
Is pinning breaking uberclone?
crummel Aug 2, 2019
3266329
Correct pinned dependencies.
crummel Aug 2, 2019
ae672aa
Update core-setup to Arcade build and patch to use MSBuild ref assemb…
crummel Aug 2, 2019
df62693
Remove bad CoherentParent for Xliff.
crummel Aug 2, 2019
89da313
Some more core-setup fixes.
crummel Aug 6, 2019
b3634fa
Update 3.0 SDK to preview7.
crummel Aug 7, 2019
3ab1cda
Fix VSTest preview version numbers.
crummel Aug 7, 2019
bd5f8ac
Fix core-setup package output directory.
crummel Aug 7, 2019
9c377f7
Update to official preview7 SDK.
crummel Aug 7, 2019
77e3218
some templating fixes
crummel Aug 7, 2019
fd04434
Think core-setup changed versioning scheme again
crummel Aug 7, 2019
03d43b1
Revert "Think core-setup changed versioning scheme again"
crummel Aug 7, 2019
9b82ab4
Try removing core-setup build number workaround.
crummel Aug 7, 2019
1d05c8a
Merge remote-tracking branch 'upstream/release/3.0' into addAspNetCore
crummel Aug 7, 2019
ef1bb38
Update AspNetCore to preview8.
crummel Aug 7, 2019
f08962a
Clean up to match new SourceLink changes.
crummel Aug 7, 2019
5ac09e5
Add a couple comments and version fixes.
crummel Aug 7, 2019
836b4e3
Update patches for preview8
crummel Aug 7, 2019
016f9e0
Merge remote-tracking branch 'origin/update-3.0-preview8' into addAsp…
crummel Aug 7, 2019
466b4bf
Another package source
crummel Aug 7, 2019
04bc1f9
Include ASP.NET Core in CLI and core-sdk.
crummel Aug 8, 2019
69e7426
Override ASP.NET RID in core-sdk.
crummel Aug 8, 2019
a812af6
Publish ASP.NET runtime.
crummel Aug 8, 2019
2aead43
ASP.NET needs some extra files
crummel Aug 8, 2019
c981512
Fix typo
crummel Aug 8, 2019
719867f
Alternate approach to ASP.NET RID.
crummel Aug 8, 2019
2b449c3
Revert "Alternate approach to ASP.NET RID."
crummel Aug 8, 2019
a4c9d52
Recommendation from core-sdk is to always use portable runtime.
crummel Aug 9, 2019
c6f516c
Non-portable core-setup requires non-portable CoreCLR.
crummel Aug 9, 2019
0143077
CoreFX also needs to be non-portable.
crummel Aug 9, 2019
e6bd587
Try not overriding OSName
crummel Aug 9, 2019
dbc27b6
Override this always?
crummel Aug 12, 2019
1b425c6
Try ASP.NET with dev blob feed.
crummel Aug 13, 2019
f6b984d
Merge remote-tracking branch 'upstream/release/3.0' into addAspNetCore
crummel Aug 13, 2019
199f912
match ASP.NET version
crummel Aug 14, 2019
420e35a
fix patch
crummel Aug 14, 2019
9cd0df9
Add coherency parents for ASP.NET.
crummel Aug 14, 2019
5ab6ceb
Update to latest 20190806.12 core-sdk and coherent ASP.NET.
crummel Aug 14, 2019
3dc8acc
Merge remote-tracking branch 'upstream/release/3.0' into addAspNetCore
crummel Aug 14, 2019
b22acea
Fix task DLL name.
crummel Aug 14, 2019
6d135b5
Attempt Arcade upgrade.
crummel Aug 14, 2019
4803fa2
Add extra restore sources for sourcelink
crummel Aug 15, 2019
8c43626
Revert "Add extra restore sources for sourcelink"
crummel Aug 15, 2019
ba82ad7
Revert "Attempt Arcade upgrade."
crummel Aug 15, 2019
0cb09f1
Output alternate property names as well.
crummel Aug 15, 2019
2ef9353
Remove some F# web tests
crummel Aug 15, 2019
fe5af61
Clarify comment
crummel Aug 15, 2019
d1f34d4
Need to match the new NuGet MSBuild version.
crummel Aug 15, 2019
c32b624
Build also relies on non-shipping packages.
crummel Aug 15, 2019
bd7179a
Fix duplicate code and add warnings for known-failing tests
crummel Aug 16, 2019
2915139
Use new version of dev-certs
crummel Aug 16, 2019
aa18008
Update online prebuilt baseline
crummel Aug 16, 2019
a42d97f
Merge remote-tracking branch 'upstream/release/3.0' into addAspNetCore
crummel Aug 16, 2019
5a33ff2
Fix bad merge in core-setup.proj.
crummel Aug 16, 2019
25b9764
Attempt elevation for ulimit change on OSX in ASP.NET.
crummel Aug 16, 2019
f50ab4b
Only run non-empty F# web tests online.
crummel Aug 16, 2019
ffd4e71
Add patch to include ASP.NET runtime compilation in source-build
crummel Aug 16, 2019
c9d6a71
Another online prebuilt baseline
crummel Aug 16, 2019
11ced2a
Patch in missing reference in AspNetCore.
crummel Aug 16, 2019
dd7ef9f
Remove bad patch
crummel Aug 17, 2019
34c958c
Local F# web tests work now.
crummel Aug 19, 2019
0776f5d
Try experimental patch to not use our copy of system.threading.tasks.…
crummel Aug 19, 2019
d69cb06
Remove problematic ref packages for now.
crummel Aug 20, 2019
e8c1a7d
Merge remote-tracking branch 'upstream/release/3.0' into addAspNetCore
crummel Aug 20, 2019
736afe9
Fix where we delete packages from
crummel Aug 21, 2019
99a54c5
Update offline prebuilt baseline.
crummel Aug 21, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions build-source-tarball.sh
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,12 @@ cp -r $SCRIPT_ROOT/bin/obj/x64/Release/reference-packages/packages $TARBALL_ROOT
cp -r $SCRIPT_ROOT/bin/obj/x64/Release/reference-packages/source $TARBALL_ROOT/reference-packages/source
cp -r $SCRIPT_ROOT/bin/obj/x64/Release/reference-packages/staging $TARBALL_ROOT/reference-packages/staging

# some references packages have a mismatching public key which causes compile issues in the tarball. Remove these.
# see issue https://github.com/dotnet/source-build/issues/1186
rm $TARBALL_ROOT/reference-packages/packages/System.Threading.Tasks.Extensions.4.0.0.nupkg
rm $TARBALL_ROOT/reference-packages/packages/System.Threading.Tasks.Extensions.4.3.0.nupkg
rm $TARBALL_ROOT/reference-packages/packages/System.Threading.Tasks.Extensions.4.5.2.nupkg

# Copy generated source from bin to src/generatedSrc
cp -r $SCRIPT_ROOT/bin/obj/x64/Release/generatedSrc $TARBALL_ROOT/src/generatedSrc

Expand Down
1 change: 1 addition & 0 deletions dir.props
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
<SourceBuiltTarBallPath>$(OutputPath)</SourceBuiltTarBallPath>
<SourceBuiltToolsetDir>$(LocalBlobStorageRoot)Toolset/</SourceBuiltToolsetDir>
<SourceBuiltRuntimeDir>$(LocalBlobStorageRoot)Runtime/</SourceBuiltRuntimeDir>
<SourceBuiltAspNetCoreRuntime>$(LocalBlobStorageRoot)aspnetcore/Runtime/</SourceBuiltAspNetCoreRuntime>
<TargetInfoProps>$(IntermediatePath)TargetInfo.props</TargetInfoProps>
<RestoreSourcePropsPath>$(IntermediatePath)RestoreSources.props</RestoreSourcePropsPath>
<PackageVersionPropsPath>$(IntermediatePath)PackageVersions.props</PackageVersionPropsPath>
Expand Down
13 changes: 9 additions & 4 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>d01b2fb7bc6bd4911e157fbd51353059a3ba1a6c</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.0.0-preview8.19381.3">
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.0.0-preview8.19405.5" CoherentParentDependency="Microsoft.AspNetCore.App.Ref">
<Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
<Sha>3cbb59559b5c0488bab471c0b8c0f2ecf14d5767</Sha>
<Sha>408bbfd1898fee0581ee4c67d1f757b2dc468bd1</Sha>
<RepoName>aspnetcore-tooling</RepoName>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.0.0-preview8.19381.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
Expand All @@ -65,9 +65,9 @@
<Sha>27af96bdb7ba8d6d7ea9ad53fc76cd1d1aa80703</Sha>
<RepoName>nuget-client</RepoName>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="3.0.0-preview8.19381.3" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
<Dependency Name="Microsoft.Extensions.Logging" Version="3.0.0-preview8.19405.4" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
<Uri>https://github.com/aspnet/Extensions</Uri>
<Sha>dea3f207c8ea27f2a13ab15880df58ff91b42dfa</Sha>
<Sha>898f6e9319f99bad6c917b22088144231db6c2c3</Sha>
<RepoName>aspnet-extensions</RepoName>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="3.0.100-preview8.19406.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
Expand All @@ -89,6 +89,11 @@
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>173ee3bd61c9549557eefa3cfb718bdef157cb87</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0-preview8.19405.7" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>4a42afc5aea63750638e118560d43db04bd9ccc2</Sha>
<RepoName>aspnetcore</RepoName>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.0.100-preview8.19406.4" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/dotnet/cli</Uri>
<Sha>1f3f34004a494b55121d05fd3d5e1ca7b0bb6a37</Sha>
Expand Down
3 changes: 2 additions & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"Microsoft.Build.CentralPackageVersions": "2.0.1",
"Microsoft.Build.Traversal": "2.0.2",
"Microsoft.NET.Sdk.IL": "3.0.0-preview-27107-01",
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19359.6"
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19359.6",
"Yarn.MSBuild": "1.15.2"
}
}
25 changes: 25 additions & 0 deletions patches/aspnetcore/0001-Exclude-analyzer-for-source-build.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From d72c7ab47fab69e2127083aeb029bae16438f6ae Mon Sep 17 00:00:00 2001
From: Chris Rummel <[email protected]>
Date: Fri, 26 Jul 2019 13:37:36 -0500
Subject: [PATCH 1/4] Exclude analyzer for source-build.

---
Directory.Build.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 06e288aa81..6c07ec1582 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -87,7 +87,7 @@
<InternalInstallerBaseName>$(RuntimeInstallerBaseName)-internal</InternalInstallerBaseName>
</PropertyGroup>

- <ItemGroup Condition="'$(DisablePubternalApiCheck)' != 'true' AND '$(IsTestProject)' != 'true' AND '$(IsBenchmarkProject)' != 'true' AND '$(IsTestAssetProject)' != 'true'">
+ <ItemGroup Condition="'$(DisablePubternalApiCheck)' != 'true' AND '$(IsTestProject)' != 'true' AND '$(IsBenchmarkProject)' != 'true' AND '$(IsTestAssetProject)' != 'true' AND '$(DotNetBuildFromSource)' != 'true'">
<PackageReference Include="Internal.AspNetCore.Analyzers" PrivateAssets="All" Version="$(InternalAspNetCoreAnalyzersPackageVersion)" IsImplicitlyDefined="true" />
</ItemGroup>

--
2.18.0

26 changes: 26 additions & 0 deletions patches/aspnetcore/0002-Import-PackageVersions.props.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From 401bac43ea2bf796046483f3f58a758a180a2e86 Mon Sep 17 00:00:00 2001
From: Chris Rummel <[email protected]>
Date: Wed, 17 Jul 2019 17:20:48 -0500
Subject: [PATCH 2/4] Import PackageVersions.props.

---
eng/Versions.props | 3 +++
1 file changed, 3 insertions(+)

diff --git a/eng/Versions.props b/eng/Versions.props
index a2f5ff40c9..c7d9bed81a 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -248,6 +248,9 @@
<XunitExtensibilityExecutionPackageVersion>$(XunitVersion)</XunitExtensibilityExecutionPackageVersion>
<MicrosoftDataSqlClientPackageVersion>1.0.19189.1-Preview</MicrosoftDataSqlClientPackageVersion>
</PropertyGroup>
+
+ <Import Project="$(DotNetPackageVersionPropsPath)" Condition="Exists('$(DotNetPackageVersionPropsPath)')" />
+
<!-- Restore feeds -->
<PropertyGroup Label="Restore feeds">
<RestoreSources Condition=" '$(DotNetBuildOffline)' != 'true' ">
--
2.18.0

Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
From 93d8a69b03abd855b56e9993ca90177f03021aaf Mon Sep 17 00:00:00 2001
From: Chris Rummel <[email protected]>
Date: Thu, 18 Jul 2019 01:34:30 -0500
Subject: [PATCH 3/4] Exclude some projects from source-build.

---
Directory.Build.props | 2 ++
1 file changed, 2 insertions(+)

diff --git a/Directory.Build.props b/Directory.Build.props
index 6c07ec1582..443f4b2797 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -18,9 +18,11 @@
<IsUnitTestProject>false</IsUnitTestProject>
<IsUnitTestProject Condition="'$(IsSpecificationTestProject)' != 'true' and ( $(MSBuildProjectName.EndsWith('Tests')) or $(MSBuildProjectName.EndsWith('.Test')) or $(MSBuildProjectName.EndsWith('.FunctionalTest')) )">true</IsUnitTestProject>
<IsTestAssetProject Condition="$(RepoRelativeProjectDir.Contains('testassets'))">true</IsTestAssetProject>
+ <IsOtherTestProject Condition="$(MSBuildProjectName.Contains('IntegrationTesting')) or $(MSBuildProjectName.Contains('TestCommon'))">true</IsOtherTestProject>
<IsSampleProject Condition="$(RepoRelativeProjectDir.Contains('sample'))">true</IsSampleProject>
<IsAnalyzersProject Condition="$(MSBuildProjectName.EndsWith('.Analyzers'))">true</IsAnalyzersProject>
<IsShipping Condition="'$(IsSampleProject)' == 'true' or '$(IsTestAssetProject)' == 'true' or '$(IsBenchmarkProject)' == 'true' or '$(IsUnitTestProject)' == 'true'">false</IsShipping>
+ <ExcludeFromSourceBuild Condition="'$(IsSampleProject)' == 'true' or '$(IsTestAssetProject)' == 'true' or '$(IsBenchmarkProject)' == 'true' or '$(IsUnitTestProject)' == 'true' or '$(IsSpecificationTestProject)' == 'true' or '$(IsOtherTestProject)' == 'true'">true</ExcludeFromSourceBuild>
</PropertyGroup>

<Import Project="eng\FlakyTests.BeforeArcade.props" />
--
2.18.0

24 changes: 24 additions & 0 deletions patches/aspnetcore/0004-Add-default-for-_SuppressSdkImports.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
From 05835b0f1ad27a315ff5a4281ff2b6b9c5698c25 Mon Sep 17 00:00:00 2001
From: Chris Rummel <[email protected]>
Date: Thu, 18 Jul 2019 03:04:54 -0500
Subject: [PATCH 4/4] Add default for _SuppressSdkImports?

---
Directory.Build.props | 1 +
1 file changed, 1 insertion(+)

diff --git a/Directory.Build.props b/Directory.Build.props
index 443f4b2797..1f36384bc5 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,6 +3,7 @@
<RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
<RepositoryUrl>https://github.com/aspnet/AspNetCore</RepositoryUrl>
<RepositoryType>git</RepositoryType>
+ <_SuppressSdkImports Condition="'$(_SuppressSdkImports)' == ''">false</_SuppressSdkImports>
</PropertyGroup>

<!-- Defines project type conventions. -->
--
2.18.0

29 changes: 29 additions & 0 deletions patches/aspnetcore/0005-Match-new-NuGet-MSBuild-version.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
From f1f64f4e018f0e1071bbbd77a2a106ae5ef7c543 Mon Sep 17 00:00:00 2001
From: Chris Rummel <[email protected]>
Date: Thu, 15 Aug 2019 16:38:08 -0500
Subject: [PATCH 5/5] Match new NuGet MSBuild version.

---
eng/tools/RepoTasks/RepoTasks.csproj | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj
index 0bf6be98ae..7a669b85d5 100644
--- a/eng/tools/RepoTasks/RepoTasks.csproj
+++ b/eng/tools/RepoTasks/RepoTasks.csproj
@@ -17,9 +17,9 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
- <PackageReference Include="Microsoft.Build.Framework" Version="15.8.166" />
- <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.8.166" />
- <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.8.166" />
+ <PackageReference Include="Microsoft.Build.Framework" Version="16.0.461" />
+ <PackageReference Include="Microsoft.Build.Tasks.Core" Version="16.0.461" />
+ <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.0.461" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
--
2.18.0

25 changes: 25 additions & 0 deletions patches/aspnetcore/0006-Elevate-for-ulimit-on-OSX.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From fff33ea363b1e4221075cb0378fb3ff9730c1389 Mon Sep 17 00:00:00 2001
From: Chris Rummel <[email protected]>
Date: Fri, 16 Aug 2019 11:44:03 -0500
Subject: [PATCH 6/6] Elevate for ulimit on OSX?

---
build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index c170ac1844..a41626f0a7 100755
--- a/build.sh
+++ b/build.sh
@@ -270,7 +270,7 @@ fi

# increase file descriptor limit on macOS
if [ "$(uname)" = "Darwin" ]; then
- ulimit -n 10000
+ sudo ulimit -n 10000
fi

# Import Arcade
--
2.18.0

25 changes: 25 additions & 0 deletions patches/aspnetcore/0007-Add-a-package-for-source-build.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From b1410d803f306572f6ee381df6648f016a445a22 Mon Sep 17 00:00:00 2001
From: John Luo <[email protected]>
Date: Fri, 16 Aug 2019 11:25:36 -0700
Subject: [PATCH 7/7] Add a package for source build

---
.../Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj | 2 ++
1 file changed, 2 insertions(+)

diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj
index b75277126a..922477578a 100644
--- a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj
+++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj
@@ -7,6 +7,8 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;aspnetcoremvc;razor</PackageTags>
<IsShippingPackage>true</IsShippingPackage>
+ <!-- Build this package in source build for testing F# templates -->
+ <ExcludeFromSourceBuild>false</ExcludeFromSourceBuild>
</PropertyGroup>

<ItemGroup>
--
2.18.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0948b034f768c52748a118d65999dd099ee0af87 Mon Sep 17 00:00:00 2001
From 908d68c90383a54c6075f8594f0d418b2bf861a0 Mon Sep 17 00:00:00 2001
From: Chris Rummel <[email protected]>
Date: Thu, 20 Jun 2019 00:55:37 -0500
Subject: [PATCH 5/5] Exclude test project from source-build
Subject: [PATCH 2/2] Exclude test project from source-build

---
test/EndToEnd/EndToEnd.Tests.csproj | 1 +
Expand Down Expand Up @@ -40,5 +40,5 @@ index a0d76c961..fa426d054 100644
\ No newline at end of file
+</Project>
--
2.18.0
2.21.0

25 changes: 13 additions & 12 deletions patches/websdk/0001-Add-PVP-import.patch
Original file line number Diff line number Diff line change
@@ -1,17 +1,25 @@
From 84ceae2fd066ef4a3fc8ac387fc7b4387a092cf9 Mon Sep 17 00:00:00 2001
From 476758b37f846d66680a2f11e69b624ad149b24f Mon Sep 17 00:00:00 2001
From: Chris Rummel <[email protected]>
Date: Mon, 24 Jun 2019 17:02:08 -0500
Subject: [PATCH] Add PVP import.

---
eng/Versions.props | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
eng/Versions.props | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index fc6d26e..1eef302 100644
index 4f22a7a..74563c7 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -24,7 +24,7 @@
@@ -19,12 +19,15 @@
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
<MicrosoftAspNetCoreAnalyzersPackageVersion>3.0.0-preview8.19405.7</MicrosoftAspNetCoreAnalyzersPackageVersion>
</PropertyGroup>
+
+ <Import Project="$(DotNetPackageVersionPropsPath)" Condition="Exists('$(DotNetPackageVersionPropsPath)')" />
+
<PropertyGroup>
<VersionPrefix>3.0.100</VersionPrefix>
<PreReleaseVersionLabel>preview8</PreReleaseVersionLabel>
</PropertyGroup>
<PropertyGroup>
Expand All @@ -20,13 +28,6 @@ index fc6d26e..1eef302 100644
$(RestoreSources);
https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json;
@@ -48,4 +48,6 @@
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>3.0.0-preview8.19405.7</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>3.0.0-preview8.19405.7</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
</PropertyGroup>
+
+ <Import Project="$(DotNetPackageVersionPropsPath)" Condition="Exists('$(DotNetPackageVersionPropsPath)')" />
</Project>
--
2.21.0

80 changes: 80 additions & 0 deletions repos/aspnetcore.proj
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<SourceDirectory>AspNetCore</SourceDirectory>
</PropertyGroup>

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))/dir.props" />

<PropertyGroup>
<BuildCommandArgs>$(BuildCommandArgs) --restore --build --pack</BuildCommandArgs>
<BuildCommandArgs>$(BuildCommandArgs) --configuration $(Configuration)</BuildCommandArgs>
<BuildCommandArgs>$(BuildCommandArgs) --ci</BuildCommandArgs>
<BuildCommandArgs>$(BuildCommandArgs) -bl</BuildCommandArgs>

<LogVerbosityOptOut>true</LogVerbosityOptOut>
<BuildCommandArgs>$(BuildCommandArgs) -v $(LogVerbosity)</BuildCommandArgs>

<BuildCommand>$(ProjectDirectory)build$(ShellExtension) $(BuildCommandArgs)</BuildCommand>

<TarballOutputDir>$(ProjectDirectory)artifacts/installers/$(Configuration)/</TarballOutputDir>
<ShippingPackagesOutput>$(ProjectDirectory)artifacts/packages/$(Configuration)/Shipping/</ShippingPackagesOutput>
<NonShippingPackagesOutput>$(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/</NonShippingPackagesOutput>
<RepoApiImplemented>false</RepoApiImplemented>
<DependencyVersionInputRepoApiImplemented>true</DependencyVersionInputRepoApiImplemented>

<GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
<NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>

<EnvironmentRestoreSources>$(SourceBuiltPackagesPath)</EnvironmentRestoreSources>
<EnvironmentRestoreSources Condition="'$(OfflineBuild)' == 'true'">$(EnvironmentRestoreSources)%3B$(ReferencePackagesDir)%3B$(PrebuiltPackagesPath)</EnvironmentRestoreSources>
<EnvironmentRestoreSources Condition="'$(OfflineBuild)' != 'true'">$(EnvironmentRestoreSources)%3Bhttps://api.nuget.org/v3/index.json</EnvironmentRestoreSources>
<EnvironmentRestoreSources Condition="'$(OfflineBuild)' != 'true'">$(EnvironmentRestoreSources)%3Bhttps://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json</EnvironmentRestoreSources>
<EnvironmentRestoreSources Condition="'$(OfflineBuild)' != 'true'">$(EnvironmentRestoreSources)%3Bhttps://dotnetfeed.blob.core.windows.net/aspnet-blazor/index.json</EnvironmentRestoreSources>
<EnvironmentRestoreSources Condition="'$(OfflineBuild)' != 'true'">$(EnvironmentRestoreSources)%3Bhttps://dotnetfeed.blob.core.windows.net/dotnet-core/index.json</EnvironmentRestoreSources>
<EnvironmentRestoreSources Condition="'$(OfflineBuild)' != 'true'">$(EnvironmentRestoreSources)%3Bhttps://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json</EnvironmentRestoreSources>
<EnvironmentRestoreSources Condition="'$(OfflineBuild)' != 'true'">$(EnvironmentRestoreSources)%3Bhttps://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json</EnvironmentRestoreSources>
</PropertyGroup>

<ItemGroup>
<RepositoryReference Include="arcade" />
<RepositoryReference Include="aspnetcore-tooling" />
<RepositoryReference Include="core-setup" />
<RepositoryReference Include="msbuild" />
<RepositoryReference Include="roslyn" />
</ItemGroup>

<ItemGroup>
<UseSourceBuiltSdkOverride Include="@(ArcadeSdkOverride)" />
</ItemGroup>

<ItemGroup>
<EnvironmentVariables Include="RestoreSources=$(EnvironmentRestoreSources)" />
</ItemGroup>

<Target Name="SetOutputList" AfterTargets="Package" BeforeTargets="GatherBuiltPackages">
<ItemGroup>
<PackagesOutputList Include="$(ShippingPackagesOutput)" />
<PackagesOutputList Include="$(NonShippingPackagesOutput)" />
</ItemGroup>
</Target>

<UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="PublishToolsetBinaries" />

<Target Name="PublishBinaries" AfterTargets="Build">
<ItemGroup>
<AspNetTarballs Include="$(TarballOutputDir)aspnetcore-*.tar.gz" />
<ExtraAspNetFiles Include="$(TarballOutputDir)*.version" />
</ItemGroup>
<Message Importance="High" Text="Publishing @(AspNetTarballs) from $(TarballOutputDir) to $(SourceBuiltAspNetCoreRuntime){version}/" />
<PublishToolsetBinaries Binaries="@(AspNetTarballs)"
DestinationFolderTemplate="$(SourceBuiltAspNetCoreRuntime){version}/">
<Output TaskParameter="PublishedVersion" PropertyName="PublishedVersion" />
</PublishToolsetBinaries>
<Message Text="Published ASP.NET runtime version $(PublishedVersion)" Importance="High" />
<Copy SourceFiles="@(ExtraAspNetFiles)" DestinationFolder="$(SourceBuiltAspNetCoreRuntime)$(PublishedVersion)" Condition="'@(ExtraAspNetFiles)' != ''" />
<Message Text="Published extra ASP.NET files @(ExtraAspNetFiles) to $(SourceBuiltAspNetCoreRuntime)$(PublishedVersion)" Importance="High" />
</Target>

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))/dir.targets" />
</Project>
Loading