-
Notifications
You must be signed in to change notification settings - Fork 443
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[ArPow Tarball] Tier 4 - Add aspnetcore repo to arpow tarball (#11113)
- Loading branch information
1 parent
19baf42
commit 0b62347
Showing
9 changed files
with
148 additions
and
40 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
61 changes: 61 additions & 0 deletions
61
...Build/tarball/content/patches/aspnetcore/0001-Run-GenerateFiles-during-source-build.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| From db187e95f62d9bff268e68f39b441b6da8be9111 Mon Sep 17 00:00:00 2001 | ||
| From: Michael Simons <msimons@microsoft.com> | ||
| Date: Mon, 2 Aug 2021 19:02:27 +0000 | ||
| Subject: [PATCH] Run GenerateFiles during source build | ||
|
|
||
| GenerateFiles is not running in source build yet the outputs are required. | ||
| These changes get GenerateFiles to run as part of source build. | ||
| These changes also turn on the binaryLog option while building the RepoTasks during source build. | ||
| --- | ||
| eng/SourceBuild.props | 3 +-- | ||
| eng/Tools.props | 2 +- | ||
| eng/tools/GenerateFiles/GenerateFiles.csproj | 1 + | ||
| 4 files changed, 3 insertions(+), 3 deletions(-) | ||
|
|
||
| diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props | ||
| index 27cbe92036..3dbfe2ce7e 100644 | ||
| --- a/eng/SourceBuild.props | ||
| +++ b/eng/SourceBuild.props | ||
| @@ -1,5 +1,4 @@ | ||
| <Project> | ||
| - | ||
| <PropertyGroup> | ||
| <GitHubRepositoryName>aspnetcore</GitHubRepositoryName> | ||
| <SourceBuildManagedOnly>true</SourceBuildManagedOnly> | ||
| @@ -47,7 +46,7 @@ | ||
| BeforeTargets="Execute"> | ||
|
|
||
| <Exec | ||
| - Command="./eng/build.sh --only-build-repo-tasks" | ||
| + Command="./eng/build.sh --only-build-repo-tasks -bl" | ||
| WorkingDirectory="$(InnerSourceBuildRepoRoot)" | ||
| EnvironmentVariables="@(InnerBuildEnv)" /> | ||
| </Target> | ||
| diff --git a/eng/Tools.props b/eng/Tools.props | ||
| index a285c2406a..a38257f770 100644 | ||
| --- a/eng/Tools.props | ||
| +++ b/eng/Tools.props | ||
| @@ -13,7 +13,7 @@ | ||
| <!-- Update the generated files when we restore projects. Skip in desktop msbuild due to VS 16.8 requirements. --> | ||
| <Target Name="GenerateDirectoryBuildFiles" | ||
| AfterTargets="Restore" | ||
| - Condition=" '$(DotNetBuildFromSource)' != 'true' AND '$(MSBuildRuntimeType)' == 'core' "> | ||
| + Condition=" '$(MSBuildRuntimeType)' == 'core' "> | ||
| <!-- Separate invocations and use different properties to ensure second can load the restored package info. --> | ||
| <MSBuild Projects="$(RepoRoot)eng\tools\GenerateFiles\GenerateFiles.csproj" | ||
| RemoveProperties="BaseIntermediateOutputPath" | ||
| diff --git a/eng/tools/GenerateFiles/GenerateFiles.csproj b/eng/tools/GenerateFiles/GenerateFiles.csproj | ||
| index 0ae5c9753e..dbf9965bf9 100644 | ||
| --- a/eng/tools/GenerateFiles/GenerateFiles.csproj | ||
| +++ b/eng/tools/GenerateFiles/GenerateFiles.csproj | ||
| @@ -2,6 +2,7 @@ | ||
| <PropertyGroup> | ||
| <!-- Use fixed version instead of $(DefaultNetCoreTargetFramework) to avoid needing workarounds set up here. --> | ||
| <TargetFramework>net5.0</TargetFramework> | ||
| + <ExcludeFromSourceBuild>false</ExcludeFromSourceBuild> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| -- | ||
| 2.29.2 | ||
|
|
28 changes: 28 additions & 0 deletions
28
...ontent/patches/aspnetcore/0002-Use-Versions.props-MicrosoftExtensionsDependencyMode.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| From 14992fbe4d8f433025cc45be81ef0035ed77221b Mon Sep 17 00:00:00 2001 | ||
| From: Michael Simons <msimons@microsoft.com> | ||
| Date: Mon, 2 Aug 2021 13:40:03 +0000 | ||
| Subject: [PATCH] Use Versions.props MicrosoftExtensionsDependencyModelVersion | ||
| in RepoTasks | ||
|
|
||
| Source build is loading a reference assembly which fails when the RepoTasks are invoked. | ||
| This change gets source build to use the version which is source built. | ||
| --- | ||
| eng/tools/RepoTasks/RepoTasks.csproj | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj | ||
| index e723beb353..67e01850f8 100644 | ||
| --- a/eng/tools/RepoTasks/RepoTasks.csproj | ||
| +++ b/eng/tools/RepoTasks/RepoTasks.csproj | ||
| @@ -16,7 +16,7 @@ | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="NuGet.Packaging" Version="$(NuGetPackagingVersion)" /> | ||
| - <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" /> | ||
| + <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelVersion)" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'"> | ||
| -- | ||
| 2.29.2 | ||
|
|
34 changes: 34 additions & 0 deletions
34
...arball/content/patches/aspnetcore/0003-Exclude-warnings-as-errors-from-source-build.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| From 6fce3b3afda68cd041cb3b38c8c21fa0513ab5e3 Mon Sep 17 00:00:00 2001 | ||
| From: Michael Simons <msimons@microsoft.com> | ||
| Date: Mon, 2 Aug 2021 19:56:17 +0000 | ||
| Subject: [PATCH] Exclude warnings as errors from source build | ||
|
|
||
|
|
||
| NU1604: These hopefully go away once runtime-portable is added to the tarball. | ||
| Microsoft.AspNetCore.App.Runtime.csproj : error NU1604: Project dependency Microsoft.NETCore.App.Crossgen2.linux-x64 does not contain an inclusive lower bound. Include a lower bound in the dependency version to ensure consistent restore results. | ||
| Microsoft.AspNetCore.App.Runtime.csproj : error NU1604: Project dependency Microsoft.NETCore.App.Runtime.linux-x64 does not contain an inclusive lower bound. Include a lower bound in the dependency version to ensure consistent restore results. | ||
|
|
||
| CS8601: | ||
| CascadingAuthenticationState.razor(4,108): error CS8601: Possible null reference assignment. | ||
| --- | ||
| Directory.Build.props | 4 ++++++++++++++ | ||
| 1 file changed, 4 insertions(+) | ||
|
|
||
| diff --git a/Directory.Build.props b/Directory.Build.props | ||
| index ba1c1675a0..ce6bc50c66 100644 | ||
| --- a/Directory.Build.props | ||
| +++ b/Directory.Build.props | ||
| @@ -225,6 +225,10 @@ | ||
| <ArchiveExtension Condition="'$(TargetOsName)' == 'win'">.zip</ArchiveExtension> | ||
| </PropertyGroup> | ||
|
|
||
| + <PropertyGroup> | ||
| + <NoWarn>$(NoWarn);NU1604;CS8601</NoWarn> | ||
| + </PropertyGroup> | ||
| + | ||
| <Import Project="eng\Workarounds.props" /> | ||
| <Import Project="artifacts\bin\GenerateFiles\Directory.Build.props" Condition=" '$(MSBuildProjectName)' != 'GenerateFiles' " /> | ||
| <Import Project="eng\Dependencies.props" /> | ||
| -- | ||
| 2.29.2 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters