Skip to content

Commit 6fd1076

Browse files
dagooddagood
authored
Merge pull request #839 from dagood/add-razor-sdk-2.2
[release/2.2] Add aspnet/Razor submodule for Microsoft.NET.Sdk.Razor
2 parents 5a850af + e282aa2 commit 6fd1076

9 files changed

+101
-2
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

‎patches/aspnet-razor/0001-Remove-Internal.AspNetCore.Sdk-avoid-prebuilt.patch

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+

‎patches/aspnet-razor/0002-Add-reference-assemblies-to-allow-net46-build.patch

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
From 3981984734d2733ac690055e22b581f867c2a481 Mon Sep 17 00:00:00 2001
2+
From: Davis Goodin <dagood@microsoft.com>
3+
Date: Wed, 24 Oct 2018 12:42:27 -0500
4+
Subject: [PATCH] Add reference assemblies to allow net46 build
5+
6+
---
7+
build/sources.props | 1 +
8+
src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj | 4 ++++
9+
2 files changed, 5 insertions(+)
10+
11+
diff --git a/build/sources.props b/build/sources.props
12+
index 02efac45..677ae724 100644
13+
--- a/build/sources.props
14+
+++ b/build/sources.props
15+
@@ -9,6 +9,7 @@
16+
https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
17+
https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
18+
https://dotnet.myget.org/F/msbuild/api/v3/index.json;
19+
+ https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json;
20+
https://dotnet.myget.org/F/roslyn/api/v3/index.json;
21+
https://vside.myget.org/F/vssdk/api/v3/index.json;
22+
https://vside.myget.org/F/vsmac/api/v3/index.json
23+
diff --git a/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj b/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj
24+
index a295f16f..4ce6e4fe 100644
25+
--- a/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj
26+
+++ b/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj
27+
@@ -21,6 +21,10 @@
28+
<PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" />
29+
</ItemGroup>
30+
31+
+ <ItemGroup>
32+
+ <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-alpha-003" PrivateAssets="all" />
33+
+ </ItemGroup>
34+
+
35+
<ItemGroup>
36+
<Compile Include="..\Microsoft.AspNetCore.Razor.Tools\ServerProtocol\*.cs">
37+
<Link>Shared\ServerProtocol\%(FileName)</Link>
38+
--
39+
2.17.1.windows.2
40+

‎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>35497</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 82276ec

‎tools-local/prebuilt-baseline-offline.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>
@@ -120,7 +121,6 @@
120121
<Usage Id="Microsoft.Net.Compilers" Version="2.8.0-beta4-62824-10" />
121122
<Usage Id="Microsoft.Net.Compilers.netcore" Version="2.6.0-beta3-62316-02" />
122123
<Usage Id="Microsoft.Net.Compilers.Targets.NetCore" Version="0.1.5-dev" />
123-
<Usage Id="Microsoft.NET.Sdk.Razor" Version="2.2.0-preview3-35497" />
124124
<Usage Id="Microsoft.NET.Test.Sdk" Version="15.8.0" />
125125
<Usage Id="Microsoft.NETCore.App" Version="1.0.3" />
126126
<Usage Id="Microsoft.NETCore.Compilers" Version="2.8.0-beta2-62719-08" />

‎tools-local/prebuilt-baseline-online.xml

Lines changed: 2 additions & 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>
@@ -111,6 +112,7 @@
111112
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="2.2.0-preview3-35497" />
112113
<Usage Id="Microsoft.Extensions.CommandLineUtils" Version="1.1.0" />
113114
<Usage Id="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
115+
<Usage Id="Microsoft.Extensions.CommandLineUtils.Sources" Version="2.2.0-preview3-35301" />
114116
<Usage Id="Microsoft.Extensions.DependencyModel" Version="1.0.0" />
115117
<Usage Id="Microsoft.Extensions.DependencyModel" Version="1.0.3" />
116118
<Usage Id="Microsoft.Extensions.DependencyModel" Version="2.0.0" />
@@ -122,7 +124,6 @@
122124
<Usage Id="Microsoft.Net.Compilers" Version="2.8.0-beta4-62824-10" />
123125
<Usage Id="Microsoft.Net.Compilers.netcore" Version="2.6.0-beta3-62316-02" />
124126
<Usage Id="Microsoft.Net.Compilers.Targets.NetCore" Version="0.1.5-dev" />
125-
<Usage Id="Microsoft.NET.Sdk.Razor" Version="2.2.0-preview3-35497" />
126127
<Usage Id="Microsoft.NET.Test.Sdk" Version="15.0.0" />
127128
<Usage Id="Microsoft.NET.Test.Sdk" Version="15.3.0" />
128129
<Usage Id="Microsoft.NET.Test.Sdk" Version="15.6.0" />

0 commit comments

Comments
 (0)