Skip to content

Commit ac534e8

Browse files
authored
Add AspNetCore (#1144)
1 parent b9a9719 commit ac534e8

27 files changed

+383
-138
lines changed

build-source-tarball.sh

+6
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,12 @@ cp -r $SCRIPT_ROOT/bin/obj/x64/Release/reference-packages/packages $TARBALL_ROOT
161161
cp -r $SCRIPT_ROOT/bin/obj/x64/Release/reference-packages/source $TARBALL_ROOT/reference-packages/source
162162
cp -r $SCRIPT_ROOT/bin/obj/x64/Release/reference-packages/staging $TARBALL_ROOT/reference-packages/staging
163163

164+
# some references packages have a mismatching public key which causes compile issues in the tarball. Remove these.
165+
# see issue https://github.com/dotnet/source-build/issues/1186
166+
rm $TARBALL_ROOT/reference-packages/packages/System.Threading.Tasks.Extensions.4.0.0.nupkg
167+
rm $TARBALL_ROOT/reference-packages/packages/System.Threading.Tasks.Extensions.4.3.0.nupkg
168+
rm $TARBALL_ROOT/reference-packages/packages/System.Threading.Tasks.Extensions.4.5.2.nupkg
169+
164170
# Copy generated source from bin to src/generatedSrc
165171
cp -r $SCRIPT_ROOT/bin/obj/x64/Release/generatedSrc $TARBALL_ROOT/src/generatedSrc
166172

dir.props

+1
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
<SourceBuiltTarBallPath>$(OutputPath)</SourceBuiltTarBallPath>
8484
<SourceBuiltToolsetDir>$(LocalBlobStorageRoot)Toolset/</SourceBuiltToolsetDir>
8585
<SourceBuiltRuntimeDir>$(LocalBlobStorageRoot)Runtime/</SourceBuiltRuntimeDir>
86+
<SourceBuiltAspNetCoreRuntime>$(LocalBlobStorageRoot)aspnetcore/Runtime/</SourceBuiltAspNetCoreRuntime>
8687
<TargetInfoProps>$(IntermediatePath)TargetInfo.props</TargetInfoProps>
8788
<RestoreSourcePropsPath>$(IntermediatePath)RestoreSources.props</RestoreSourcePropsPath>
8889
<PackageVersionPropsPath>$(IntermediatePath)PackageVersions.props</PackageVersionPropsPath>

eng/Version.Details.xml

+9-4
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
<Uri>https://github.com/dotnet/core-setup</Uri>
4444
<Sha>d01b2fb7bc6bd4911e157fbd51353059a3ba1a6c</Sha>
4545
</Dependency>
46-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.0.0-preview8.19381.3">
46+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.0.0-preview8.19405.5" CoherentParentDependency="Microsoft.AspNetCore.App.Ref">
4747
<Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
48-
<Sha>3cbb59559b5c0488bab471c0b8c0f2ecf14d5767</Sha>
48+
<Sha>408bbfd1898fee0581ee4c67d1f757b2dc468bd1</Sha>
4949
<RepoName>aspnetcore-tooling</RepoName>
5050
</Dependency>
5151
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.0.0-preview8.19381.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
@@ -65,9 +65,9 @@
6565
<Sha>27af96bdb7ba8d6d7ea9ad53fc76cd1d1aa80703</Sha>
6666
<RepoName>nuget-client</RepoName>
6767
</Dependency>
68-
<Dependency Name="Microsoft.Extensions.Logging" Version="3.0.0-preview8.19381.3" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
68+
<Dependency Name="Microsoft.Extensions.Logging" Version="3.0.0-preview8.19405.4" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
6969
<Uri>https://github.com/aspnet/Extensions</Uri>
70-
<Sha>dea3f207c8ea27f2a13ab15880df58ff91b42dfa</Sha>
70+
<Sha>898f6e9319f99bad6c917b22088144231db6c2c3</Sha>
7171
<RepoName>aspnet-extensions</RepoName>
7272
</Dependency>
7373
<Dependency Name="Microsoft.NET.Sdk" Version="3.0.100-preview8.19406.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
@@ -89,6 +89,11 @@
8989
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
9090
<Sha>173ee3bd61c9549557eefa3cfb718bdef157cb87</Sha>
9191
</Dependency>
92+
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0-preview8.19405.7" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
93+
<Uri>https://github.com/aspnet/AspNetCore</Uri>
94+
<Sha>4a42afc5aea63750638e118560d43db04bd9ccc2</Sha>
95+
<RepoName>aspnetcore</RepoName>
96+
</Dependency>
9297
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.0.100-preview8.19406.4" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
9398
<Uri>https://github.com/dotnet/cli</Uri>
9499
<Sha>1f3f34004a494b55121d05fd3d5e1ca7b0bb6a37</Sha>

global.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"Microsoft.Build.CentralPackageVersions": "2.0.1",
77
"Microsoft.Build.Traversal": "2.0.2",
88
"Microsoft.NET.Sdk.IL": "3.0.0-preview-27107-01",
9-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19359.6"
9+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19359.6",
10+
"Yarn.MSBuild": "1.15.2"
1011
}
1112
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From d72c7ab47fab69e2127083aeb029bae16438f6ae Mon Sep 17 00:00:00 2001
2+
From: Chris Rummel <[email protected]>
3+
Date: Fri, 26 Jul 2019 13:37:36 -0500
4+
Subject: [PATCH 1/4] Exclude analyzer for source-build.
5+
6+
---
7+
Directory.Build.props | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/Directory.Build.props b/Directory.Build.props
11+
index 06e288aa81..6c07ec1582 100644
12+
--- a/Directory.Build.props
13+
+++ b/Directory.Build.props
14+
@@ -87,7 +87,7 @@
15+
<InternalInstallerBaseName>$(RuntimeInstallerBaseName)-internal</InternalInstallerBaseName>
16+
</PropertyGroup>
17+
18+
- <ItemGroup Condition="'$(DisablePubternalApiCheck)' != 'true' AND '$(IsTestProject)' != 'true' AND '$(IsBenchmarkProject)' != 'true' AND '$(IsTestAssetProject)' != 'true'">
19+
+ <ItemGroup Condition="'$(DisablePubternalApiCheck)' != 'true' AND '$(IsTestProject)' != 'true' AND '$(IsBenchmarkProject)' != 'true' AND '$(IsTestAssetProject)' != 'true' AND '$(DotNetBuildFromSource)' != 'true'">
20+
<PackageReference Include="Internal.AspNetCore.Analyzers" PrivateAssets="All" Version="$(InternalAspNetCoreAnalyzersPackageVersion)" IsImplicitlyDefined="true" />
21+
</ItemGroup>
22+
23+
--
24+
2.18.0
25+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
From 401bac43ea2bf796046483f3f58a758a180a2e86 Mon Sep 17 00:00:00 2001
2+
From: Chris Rummel <[email protected]>
3+
Date: Wed, 17 Jul 2019 17:20:48 -0500
4+
Subject: [PATCH 2/4] Import PackageVersions.props.
5+
6+
---
7+
eng/Versions.props | 3 +++
8+
1 file changed, 3 insertions(+)
9+
10+
diff --git a/eng/Versions.props b/eng/Versions.props
11+
index a2f5ff40c9..c7d9bed81a 100644
12+
--- a/eng/Versions.props
13+
+++ b/eng/Versions.props
14+
@@ -248,6 +248,9 @@
15+
<XunitExtensibilityExecutionPackageVersion>$(XunitVersion)</XunitExtensibilityExecutionPackageVersion>
16+
<MicrosoftDataSqlClientPackageVersion>1.0.19189.1-Preview</MicrosoftDataSqlClientPackageVersion>
17+
</PropertyGroup>
18+
+
19+
+ <Import Project="$(DotNetPackageVersionPropsPath)" Condition="Exists('$(DotNetPackageVersionPropsPath)')" />
20+
+
21+
<!-- Restore feeds -->
22+
<PropertyGroup Label="Restore feeds">
23+
<RestoreSources Condition=" '$(DotNetBuildOffline)' != 'true' ">
24+
--
25+
2.18.0
26+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
From 93d8a69b03abd855b56e9993ca90177f03021aaf Mon Sep 17 00:00:00 2001
2+
From: Chris Rummel <[email protected]>
3+
Date: Thu, 18 Jul 2019 01:34:30 -0500
4+
Subject: [PATCH 3/4] Exclude some projects from source-build.
5+
6+
---
7+
Directory.Build.props | 2 ++
8+
1 file changed, 2 insertions(+)
9+
10+
diff --git a/Directory.Build.props b/Directory.Build.props
11+
index 6c07ec1582..443f4b2797 100644
12+
--- a/Directory.Build.props
13+
+++ b/Directory.Build.props
14+
@@ -18,9 +18,11 @@
15+
<IsUnitTestProject>false</IsUnitTestProject>
16+
<IsUnitTestProject Condition="'$(IsSpecificationTestProject)' != 'true' and ( $(MSBuildProjectName.EndsWith('Tests')) or $(MSBuildProjectName.EndsWith('.Test')) or $(MSBuildProjectName.EndsWith('.FunctionalTest')) )">true</IsUnitTestProject>
17+
<IsTestAssetProject Condition="$(RepoRelativeProjectDir.Contains('testassets'))">true</IsTestAssetProject>
18+
+ <IsOtherTestProject Condition="$(MSBuildProjectName.Contains('IntegrationTesting')) or $(MSBuildProjectName.Contains('TestCommon'))">true</IsOtherTestProject>
19+
<IsSampleProject Condition="$(RepoRelativeProjectDir.Contains('sample'))">true</IsSampleProject>
20+
<IsAnalyzersProject Condition="$(MSBuildProjectName.EndsWith('.Analyzers'))">true</IsAnalyzersProject>
21+
<IsShipping Condition="'$(IsSampleProject)' == 'true' or '$(IsTestAssetProject)' == 'true' or '$(IsBenchmarkProject)' == 'true' or '$(IsUnitTestProject)' == 'true'">false</IsShipping>
22+
+ <ExcludeFromSourceBuild Condition="'$(IsSampleProject)' == 'true' or '$(IsTestAssetProject)' == 'true' or '$(IsBenchmarkProject)' == 'true' or '$(IsUnitTestProject)' == 'true' or '$(IsSpecificationTestProject)' == 'true' or '$(IsOtherTestProject)' == 'true'">true</ExcludeFromSourceBuild>
23+
</PropertyGroup>
24+
25+
<Import Project="eng\FlakyTests.BeforeArcade.props" />
26+
--
27+
2.18.0
28+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From 05835b0f1ad27a315ff5a4281ff2b6b9c5698c25 Mon Sep 17 00:00:00 2001
2+
From: Chris Rummel <[email protected]>
3+
Date: Thu, 18 Jul 2019 03:04:54 -0500
4+
Subject: [PATCH 4/4] Add default for _SuppressSdkImports?
5+
6+
---
7+
Directory.Build.props | 1 +
8+
1 file changed, 1 insertion(+)
9+
10+
diff --git a/Directory.Build.props b/Directory.Build.props
11+
index 443f4b2797..1f36384bc5 100644
12+
--- a/Directory.Build.props
13+
+++ b/Directory.Build.props
14+
@@ -3,6 +3,7 @@
15+
<RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
16+
<RepositoryUrl>https://github.com/aspnet/AspNetCore</RepositoryUrl>
17+
<RepositoryType>git</RepositoryType>
18+
+ <_SuppressSdkImports Condition="'$(_SuppressSdkImports)' == ''">false</_SuppressSdkImports>
19+
</PropertyGroup>
20+
21+
<!-- Defines project type conventions. -->
22+
--
23+
2.18.0
24+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
From f1f64f4e018f0e1071bbbd77a2a106ae5ef7c543 Mon Sep 17 00:00:00 2001
2+
From: Chris Rummel <[email protected]>
3+
Date: Thu, 15 Aug 2019 16:38:08 -0500
4+
Subject: [PATCH 5/5] Match new NuGet MSBuild version.
5+
6+
---
7+
eng/tools/RepoTasks/RepoTasks.csproj | 6 +++---
8+
1 file changed, 3 insertions(+), 3 deletions(-)
9+
10+
diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj
11+
index 0bf6be98ae..7a669b85d5 100644
12+
--- a/eng/tools/RepoTasks/RepoTasks.csproj
13+
+++ b/eng/tools/RepoTasks/RepoTasks.csproj
14+
@@ -17,9 +17,9 @@
15+
</ItemGroup>
16+
17+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
18+
- <PackageReference Include="Microsoft.Build.Framework" Version="15.8.166" />
19+
- <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.8.166" />
20+
- <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.8.166" />
21+
+ <PackageReference Include="Microsoft.Build.Framework" Version="16.0.461" />
22+
+ <PackageReference Include="Microsoft.Build.Tasks.Core" Version="16.0.461" />
23+
+ <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.0.461" />
24+
</ItemGroup>
25+
26+
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
27+
--
28+
2.18.0
29+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From fff33ea363b1e4221075cb0378fb3ff9730c1389 Mon Sep 17 00:00:00 2001
2+
From: Chris Rummel <[email protected]>
3+
Date: Fri, 16 Aug 2019 11:44:03 -0500
4+
Subject: [PATCH 6/6] Elevate for ulimit on OSX?
5+
6+
---
7+
build.sh | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/build.sh b/build.sh
11+
index c170ac1844..a41626f0a7 100755
12+
--- a/build.sh
13+
+++ b/build.sh
14+
@@ -270,7 +270,7 @@ fi
15+
16+
# increase file descriptor limit on macOS
17+
if [ "$(uname)" = "Darwin" ]; then
18+
- ulimit -n 10000
19+
+ sudo ulimit -n 10000
20+
fi
21+
22+
# Import Arcade
23+
--
24+
2.18.0
25+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From b1410d803f306572f6ee381df6648f016a445a22 Mon Sep 17 00:00:00 2001
2+
From: John Luo <[email protected]>
3+
Date: Fri, 16 Aug 2019 11:25:36 -0700
4+
Subject: [PATCH 7/7] Add a package for source build
5+
6+
---
7+
.../Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj | 2 ++
8+
1 file changed, 2 insertions(+)
9+
10+
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
11+
index b75277126a..922477578a 100644
12+
--- a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj
13+
+++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj
14+
@@ -7,6 +7,8 @@
15+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
16+
<PackageTags>aspnetcore;aspnetcoremvc;razor</PackageTags>
17+
<IsShippingPackage>true</IsShippingPackage>
18+
+ <!-- Build this package in source build for testing F# templates -->
19+
+ <ExcludeFromSourceBuild>false</ExcludeFromSourceBuild>
20+
</PropertyGroup>
21+
22+
<ItemGroup>
23+
--
24+
2.18.0
25+

patches/core-sdk/0005-Exclude-test-project-from-source-build.patch renamed to patches/core-sdk/0002-Exclude-test-project-from-source-build.patch

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

66
---
77
test/EndToEnd/EndToEnd.Tests.csproj | 1 +
@@ -40,5 +40,5 @@ index a0d76c961..fa426d054 100644
4040
\ No newline at end of file
4141
+</Project>
4242
--
43-
2.18.0
43+
2.21.0
4444

+13-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,25 @@
1-
From 84ceae2fd066ef4a3fc8ac387fc7b4387a092cf9 Mon Sep 17 00:00:00 2001
1+
From 476758b37f846d66680a2f11e69b624ad149b24f Mon Sep 17 00:00:00 2001
22
From: Chris Rummel <[email protected]>
33
Date: Mon, 24 Jun 2019 17:02:08 -0500
44
Subject: [PATCH] Add PVP import.
55

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

1010
diff --git a/eng/Versions.props b/eng/Versions.props
11-
index fc6d26e..1eef302 100644
11+
index 4f22a7a..74563c7 100644
1212
--- a/eng/Versions.props
1313
+++ b/eng/Versions.props
14-
@@ -24,7 +24,7 @@
14+
@@ -19,12 +19,15 @@
15+
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
16+
<MicrosoftAspNetCoreAnalyzersPackageVersion>3.0.0-preview8.19405.7</MicrosoftAspNetCoreAnalyzersPackageVersion>
17+
</PropertyGroup>
18+
+
19+
+ <Import Project="$(DotNetPackageVersionPropsPath)" Condition="Exists('$(DotNetPackageVersionPropsPath)')" />
20+
+
21+
<PropertyGroup>
22+
<VersionPrefix>3.0.100</VersionPrefix>
1523
<PreReleaseVersionLabel>preview8</PreReleaseVersionLabel>
1624
</PropertyGroup>
1725
<PropertyGroup>
@@ -20,13 +28,6 @@ index fc6d26e..1eef302 100644
2028
$(RestoreSources);
2129
https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
2230
https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json;
23-
@@ -48,4 +48,6 @@
24-
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>3.0.0-preview8.19405.7</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
25-
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>3.0.0-preview8.19405.7</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
26-
</PropertyGroup>
27-
+
28-
+ <Import Project="$(DotNetPackageVersionPropsPath)" Condition="Exists('$(DotNetPackageVersionPropsPath)')" />
29-
</Project>
3031
--
3132
2.21.0
3233

repos/aspnetcore.proj

+80
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<SourceDirectory>AspNetCore</SourceDirectory>
5+
</PropertyGroup>
6+
7+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))/dir.props" />
8+
9+
<PropertyGroup>
10+
<BuildCommandArgs>$(BuildCommandArgs) --restore --build --pack</BuildCommandArgs>
11+
<BuildCommandArgs>$(BuildCommandArgs) --configuration $(Configuration)</BuildCommandArgs>
12+
<BuildCommandArgs>$(BuildCommandArgs) --ci</BuildCommandArgs>
13+
<BuildCommandArgs>$(BuildCommandArgs) -bl</BuildCommandArgs>
14+
15+
<LogVerbosityOptOut>true</LogVerbosityOptOut>
16+
<BuildCommandArgs>$(BuildCommandArgs) -v $(LogVerbosity)</BuildCommandArgs>
17+
18+
<BuildCommand>$(ProjectDirectory)build$(ShellExtension) $(BuildCommandArgs)</BuildCommand>
19+
20+
<TarballOutputDir>$(ProjectDirectory)artifacts/installers/$(Configuration)/</TarballOutputDir>
21+
<ShippingPackagesOutput>$(ProjectDirectory)artifacts/packages/$(Configuration)/Shipping/</ShippingPackagesOutput>
22+
<NonShippingPackagesOutput>$(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/</NonShippingPackagesOutput>
23+
<RepoApiImplemented>false</RepoApiImplemented>
24+
<DependencyVersionInputRepoApiImplemented>true</DependencyVersionInputRepoApiImplemented>
25+
26+
<GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
27+
<NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
28+
29+
<EnvironmentRestoreSources>$(SourceBuiltPackagesPath)</EnvironmentRestoreSources>
30+
<EnvironmentRestoreSources Condition="'$(OfflineBuild)' == 'true'">$(EnvironmentRestoreSources)%3B$(ReferencePackagesDir)%3B$(PrebuiltPackagesPath)</EnvironmentRestoreSources>
31+
<EnvironmentRestoreSources Condition="'$(OfflineBuild)' != 'true'">$(EnvironmentRestoreSources)%3Bhttps://api.nuget.org/v3/index.json</EnvironmentRestoreSources>
32+
<EnvironmentRestoreSources Condition="'$(OfflineBuild)' != 'true'">$(EnvironmentRestoreSources)%3Bhttps://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json</EnvironmentRestoreSources>
33+
<EnvironmentRestoreSources Condition="'$(OfflineBuild)' != 'true'">$(EnvironmentRestoreSources)%3Bhttps://dotnetfeed.blob.core.windows.net/aspnet-blazor/index.json</EnvironmentRestoreSources>
34+
<EnvironmentRestoreSources Condition="'$(OfflineBuild)' != 'true'">$(EnvironmentRestoreSources)%3Bhttps://dotnetfeed.blob.core.windows.net/dotnet-core/index.json</EnvironmentRestoreSources>
35+
<EnvironmentRestoreSources Condition="'$(OfflineBuild)' != 'true'">$(EnvironmentRestoreSources)%3Bhttps://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json</EnvironmentRestoreSources>
36+
<EnvironmentRestoreSources Condition="'$(OfflineBuild)' != 'true'">$(EnvironmentRestoreSources)%3Bhttps://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json</EnvironmentRestoreSources>
37+
</PropertyGroup>
38+
39+
<ItemGroup>
40+
<RepositoryReference Include="arcade" />
41+
<RepositoryReference Include="aspnetcore-tooling" />
42+
<RepositoryReference Include="core-setup" />
43+
<RepositoryReference Include="msbuild" />
44+
<RepositoryReference Include="roslyn" />
45+
</ItemGroup>
46+
47+
<ItemGroup>
48+
<UseSourceBuiltSdkOverride Include="@(ArcadeSdkOverride)" />
49+
</ItemGroup>
50+
51+
<ItemGroup>
52+
<EnvironmentVariables Include="RestoreSources=$(EnvironmentRestoreSources)" />
53+
</ItemGroup>
54+
55+
<Target Name="SetOutputList" AfterTargets="Package" BeforeTargets="GatherBuiltPackages">
56+
<ItemGroup>
57+
<PackagesOutputList Include="$(ShippingPackagesOutput)" />
58+
<PackagesOutputList Include="$(NonShippingPackagesOutput)" />
59+
</ItemGroup>
60+
</Target>
61+
62+
<UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="PublishToolsetBinaries" />
63+
64+
<Target Name="PublishBinaries" AfterTargets="Build">
65+
<ItemGroup>
66+
<AspNetTarballs Include="$(TarballOutputDir)aspnetcore-*.tar.gz" />
67+
<ExtraAspNetFiles Include="$(TarballOutputDir)*.version" />
68+
</ItemGroup>
69+
<Message Importance="High" Text="Publishing @(AspNetTarballs) from $(TarballOutputDir) to $(SourceBuiltAspNetCoreRuntime){version}/" />
70+
<PublishToolsetBinaries Binaries="@(AspNetTarballs)"
71+
DestinationFolderTemplate="$(SourceBuiltAspNetCoreRuntime){version}/">
72+
<Output TaskParameter="PublishedVersion" PropertyName="PublishedVersion" />
73+
</PublishToolsetBinaries>
74+
<Message Text="Published ASP.NET runtime version $(PublishedVersion)" Importance="High" />
75+
<Copy SourceFiles="@(ExtraAspNetFiles)" DestinationFolder="$(SourceBuiltAspNetCoreRuntime)$(PublishedVersion)" Condition="'@(ExtraAspNetFiles)' != ''" />
76+
<Message Text="Published extra ASP.NET files @(ExtraAspNetFiles) to $(SourceBuiltAspNetCoreRuntime)$(PublishedVersion)" Importance="High" />
77+
</Target>
78+
79+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))/dir.targets" />
80+
</Project>

0 commit comments

Comments
 (0)