Skip to content

Commit 8880f44

Browse files
authored
[release/2.1] Add aspnet/Razor submodule for Microsoft.NET.Sdk.Razor (#834)
* Add aspnet/Razor submodule at 2.1.5 commit. * Add aspnet-razor.proj for Microsoft.NET.Sdk.Razor Include patch to remove unneeded prebuilts. * Set IsFinalBuild to UseStableVersions * Update prebuilt baselines
1 parent bce9b53 commit 8880f44

File tree

8 files changed

+60
-1
lines changed

8 files changed

+60
-1
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,6 @@
6666
[submodule "src/linker"]
6767
path = src/linker
6868
url = https://github.com/mono/linker.git
69+
[submodule "src/aspnet-razor"]
70+
path = src/aspnet-razor
71+
url = https://github.com/aspnet/Razor
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From c5c693544b006014e6dfd7e8161e091a1ff19ca5 Mon Sep 17 00:00:00 2001
2+
From: Davis Goodin <dagood@microsoft.com>
3+
Date: Wed, 24 Oct 2018 12:27:13 -0500
4+
Subject: [PATCH] Remove Internal.AspNetCore.Sdk: avoid prebuilt
5+
6+
Internal.AspNetCore.Sdk is not used for the very specific build source-build needs to perform. Remove it to avoid adding prebuilt packages.
7+
---
8+
Directory.Build.props | 1 -
9+
1 file changed, 1 deletion(-)
10+
11+
diff --git a/Directory.Build.props b/Directory.Build.props
12+
index 8260b6f3..6a18283d 100644
13+
--- a/Directory.Build.props
14+
+++ b/Directory.Build.props
15+
@@ -20,7 +20,6 @@
16+
</PropertyGroup>
17+
18+
<ItemGroup>
19+
- <PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
20+
</ItemGroup>
21+
22+
</Project>
23+
--
24+
2.17.1.windows.2
25+

repos/aspnet-razor.proj

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))/dir.props" />
4+
<PropertyGroup>
5+
<RazorSdkProjectDir>$(ProjectDirectory)src/Microsoft.NET.Sdk.Razor/</RazorSdkProjectDir>
6+
<RazorSdkProjectFile>$(RazorSdkProjectDir)Microsoft.NET.Sdk.Razor.csproj</RazorSdkProjectFile>
7+
8+
<BuildNumber>30932</BuildNumber>
9+
10+
<BuildCommandArgs>pack</BuildCommandArgs>
11+
<BuildCommandArgs>$(BuildCommandArgs) $(RazorSdkProjectFile)</BuildCommandArgs>
12+
<BuildCommandArgs>$(BuildCommandArgs) /p:Configuration=$(Configuration)</BuildCommandArgs>
13+
<BuildCommandArgs>$(BuildCommandArgs) /p:IsFinalBuild=$(UseStableVersions)</BuildCommandArgs>
14+
<BuildCommandArgs>$(BuildCommandArgs) /p:BuildNumber=$(BuildNumber)</BuildCommandArgs>
15+
<BuildCommandArgs>$(BuildCommandArgs) /bl</BuildCommandArgs>
16+
17+
<BuildCommand>$(DotnetToolCommand) $(BuildCommandArgs)</BuildCommand>
18+
19+
<PackagesOutput>$(RazorSdkProjectDir)bin/$(Configuration)/</PackagesOutput>
20+
21+
<OutputPlacementRepoApiImplemented>false</OutputPlacementRepoApiImplemented>
22+
23+
<OrchestratedManifestBuildName>N/A</OrchestratedManifestBuildName>
24+
</PropertyGroup>
25+
26+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))/dir.targets" />
27+
</Project>

repos/cli.proj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858

5959
<ItemGroup>
6060
<RepositoryReference Include="application-insights" />
61+
<RepositoryReference Include="aspnet-razor" />
6162
<RepositoryReference Include="cli-migrate" />
6263
<RepositoryReference Include="clicommandlineparser" />
6364
<RepositoryReference Include="core-setup" />

repos/known-good.proj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
<!-- Tier 1 -->
1414
<RepositoryReference Include="application-insights" />
15+
<RepositoryReference Include="aspnet-razor" />
1516
<RepositoryReference Include="common" />
1617
<RepositoryReference Include="netcorecli-fsc" />
1718
<RepositoryReference Include="newtonsoft-json" />

src/aspnet-razor

Submodule aspnet-razor added at d0c7d81

tools-local/prebuilt-baseline-offline.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<CreatedByRid>centos.7-x64</CreatedByRid>
33
<ProjectDirectories>
44
<Dir>src/application-insights/</Dir>
5+
<Dir>src/aspnet-razor/</Dir>
56
<Dir>src/cli-migrate/</Dir>
67
<Dir>src/cli/</Dir>
78
<Dir>src/clicommandlineparser/</Dir>

tools-local/prebuilt-baseline-online.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<CreatedByRid>centos.7-x64</CreatedByRid>
33
<ProjectDirectories>
44
<Dir>src/application-insights/</Dir>
5+
<Dir>src/aspnet-razor/</Dir>
56
<Dir>src/cli-migrate/</Dir>
67
<Dir>src/cli/</Dir>
78
<Dir>src/clicommandlineparser/</Dir>
@@ -117,7 +118,6 @@
117118
<Usage Id="Microsoft.Net.Compilers" Version="2.8.0-beta4-62824-10" />
118119
<Usage Id="Microsoft.Net.Compilers.netcore" Version="2.6.0-beta3-62316-02" />
119120
<Usage Id="Microsoft.Net.Compilers.Targets.NetCore" Version="0.1.5-dev" />
120-
<Usage Id="Microsoft.NET.Sdk.Razor" Version="2.1.2" />
121121
<Usage Id="Microsoft.NET.Test.Sdk" Version="15.0.0" />
122122
<Usage Id="Microsoft.NET.Test.Sdk" Version="15.3.0" />
123123
<Usage Id="Microsoft.NET.Test.Sdk" Version="15.6.0" />

0 commit comments

Comments
 (0)