Skip to content

Remove Razor SDK from repo #29548

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.

Sign up for GitHub

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 3 commits into from
Jan 24, 2021
Merged

Remove Razor SDK from repo #29548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d4bcf4
Remove Razor SDK from repo
captainsafia Jan 22, 2021
92ec24b
Use newer SDK version
captainsafia Jan 23, 2021
30b4c45
Delete mroe things
pranavkm Jan 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
81 changes: 0 additions & 81 deletions AspNetCore.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1033,12 +1033,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Language.Test", "src\Razor\Microsoft.AspNetCore.Razor.Language\test\Microsoft.AspNetCore.Razor.Language.Test.csproj", "{313ADEF5-5A2D-4C11-8655-E227445144E2}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.AspNetCore.Razor.Tools", "Microsoft.AspNetCore.Razor.Tools", "{B9704650-5360-416C-9393-FAF707766AA8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "rzc", "src\Razor\Microsoft.AspNetCore.Razor.Tools\src\rzc.csproj", "{4C84173F-5C1F-49A1-895A-C0CA11DE84B1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Tools.Test", "src\Razor\Microsoft.AspNetCore.Razor.Tools\test\Microsoft.AspNetCore.Razor.Tools.Test.csproj", "{FE095F11-4CD2-406D-A2BB-1BE569603BF0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.CodeAnalysis.Razor", "Microsoft.CodeAnalysis.Razor", "{3854EA4A-5530-4FEC-971E-B0CB45C5B19D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Razor", "src\Razor\Microsoft.CodeAnalysis.Razor\src\Microsoft.CodeAnalysis.Razor.csproj", "{AE06A841-F90D-486A-9DEF-70495DF4D28A}"
Expand All @@ -1055,12 +1049,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "perf", "perf", "{D510860C-B
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Performance", "src\Razor\perf\Microsoft.AspNetCore.Razor.Performance\Microsoft.AspNetCore.Razor.Performance.csproj", "{8ED505A5-A33A-401E-89BA-3AED7B73DD6A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.NET.Sdk.Razor", "Microsoft.NET.Sdk.Razor", "{DA9E1AB0-0094-4777-BF3F-BC5596C3CDA9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Sdk.Razor", "src\Razor\Microsoft.NET.Sdk.Razor\src\Microsoft.NET.Sdk.Razor.csproj", "{44B3F6C4-0F65-4649-B4CF-6CDC2094E061}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Sdk.Razor.Test", "src\Razor\Microsoft.NET.Sdk.Razor\test\Microsoft.NET.Sdk.Razor.Test.csproj", "{7CB23DCD-B416-4293-9848-224077F9E71D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{06C916C7-67BF-45DC-9D0B-CEEF0C731451}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Test.Common", "src\Razor\test\Microsoft.AspNetCore.Razor.Test.Common\Microsoft.AspNetCore.Razor.Test.Common.csproj", "{69637901-CAD7-4335-81F4-92E03C4DA354}"
Expand All @@ -1075,8 +1063,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X", "src\Razor\test\Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X\Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj", "{2A3B2388-F9F3-4F28-B008-2CD7862A86C4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Sdk.Razor.IntegrationTests", "src\Razor\Microsoft.NET.Sdk.Razor\integrationtests\Microsoft.NET.Sdk.Razor.IntegrationTests.csproj", "{930CB054-3E69-4721-9F7E-01FB911AAF6A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{CF9D35EC-CA9B-481D-BAAC-5D4654732AB9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AuthSamples.FunctionalTests", "src\Security\test\AuthSamples.FunctionalTests\AuthSamples.FunctionalTests.csproj", "{31B7D2B1-47AF-432B-BF07-73916EF238EE}"
Expand Down Expand Up @@ -5269,30 +5255,6 @@ Global
{313ADEF5-5A2D-4C11-8655-E227445144E2}.Release|x64.Build.0 = Release|Any CPU
{313ADEF5-5A2D-4C11-8655-E227445144E2}.Release|x86.ActiveCfg = Release|Any CPU
{313ADEF5-5A2D-4C11-8655-E227445144E2}.Release|x86.Build.0 = Release|Any CPU
{4C84173F-5C1F-49A1-895A-C0CA11DE84B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4C84173F-5C1F-49A1-895A-C0CA11DE84B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4C84173F-5C1F-49A1-895A-C0CA11DE84B1}.Debug|x64.ActiveCfg = Debug|Any CPU
{4C84173F-5C1F-49A1-895A-C0CA11DE84B1}.Debug|x64.Build.0 = Debug|Any CPU
{4C84173F-5C1F-49A1-895A-C0CA11DE84B1}.Debug|x86.ActiveCfg = Debug|Any CPU
{4C84173F-5C1F-49A1-895A-C0CA11DE84B1}.Debug|x86.Build.0 = Debug|Any CPU
{4C84173F-5C1F-49A1-895A-C0CA11DE84B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4C84173F-5C1F-49A1-895A-C0CA11DE84B1}.Release|Any CPU.Build.0 = Release|Any CPU
{4C84173F-5C1F-49A1-895A-C0CA11DE84B1}.Release|x64.ActiveCfg = Release|Any CPU
{4C84173F-5C1F-49A1-895A-C0CA11DE84B1}.Release|x64.Build.0 = Release|Any CPU
{4C84173F-5C1F-49A1-895A-C0CA11DE84B1}.Release|x86.ActiveCfg = Release|Any CPU
{4C84173F-5C1F-49A1-895A-C0CA11DE84B1}.Release|x86.Build.0 = Release|Any CPU
{FE095F11-4CD2-406D-A2BB-1BE569603BF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FE095F11-4CD2-406D-A2BB-1BE569603BF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FE095F11-4CD2-406D-A2BB-1BE569603BF0}.Debug|x64.ActiveCfg = Debug|Any CPU
{FE095F11-4CD2-406D-A2BB-1BE569603BF0}.Debug|x64.Build.0 = Debug|Any CPU
{FE095F11-4CD2-406D-A2BB-1BE569603BF0}.Debug|x86.ActiveCfg = Debug|Any CPU
{FE095F11-4CD2-406D-A2BB-1BE569603BF0}.Debug|x86.Build.0 = Debug|Any CPU
{FE095F11-4CD2-406D-A2BB-1BE569603BF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FE095F11-4CD2-406D-A2BB-1BE569603BF0}.Release|Any CPU.Build.0 = Release|Any CPU
{FE095F11-4CD2-406D-A2BB-1BE569603BF0}.Release|x64.ActiveCfg = Release|Any CPU
{FE095F11-4CD2-406D-A2BB-1BE569603BF0}.Release|x64.Build.0 = Release|Any CPU
{FE095F11-4CD2-406D-A2BB-1BE569603BF0}.Release|x86.ActiveCfg = Release|Any CPU
{FE095F11-4CD2-406D-A2BB-1BE569603BF0}.Release|x86.Build.0 = Release|Any CPU
{AE06A841-F90D-486A-9DEF-70495DF4D28A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AE06A841-F90D-486A-9DEF-70495DF4D28A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AE06A841-F90D-486A-9DEF-70495DF4D28A}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -5353,30 +5315,6 @@ Global
{8ED505A5-A33A-401E-89BA-3AED7B73DD6A}.Release|x64.Build.0 = Release|Any CPU
{8ED505A5-A33A-401E-89BA-3AED7B73DD6A}.Release|x86.ActiveCfg = Release|Any CPU
{8ED505A5-A33A-401E-89BA-3AED7B73DD6A}.Release|x86.Build.0 = Release|Any CPU
{44B3F6C4-0F65-4649-B4CF-6CDC2094E061}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{44B3F6C4-0F65-4649-B4CF-6CDC2094E061}.Debug|Any CPU.Build.0 = Debug|Any CPU
{44B3F6C4-0F65-4649-B4CF-6CDC2094E061}.Debug|x64.ActiveCfg = Debug|Any CPU
{44B3F6C4-0F65-4649-B4CF-6CDC2094E061}.Debug|x64.Build.0 = Debug|Any CPU
{44B3F6C4-0F65-4649-B4CF-6CDC2094E061}.Debug|x86.ActiveCfg = Debug|Any CPU
{44B3F6C4-0F65-4649-B4CF-6CDC2094E061}.Debug|x86.Build.0 = Debug|Any CPU
{44B3F6C4-0F65-4649-B4CF-6CDC2094E061}.Release|Any CPU.ActiveCfg = Release|Any CPU
{44B3F6C4-0F65-4649-B4CF-6CDC2094E061}.Release|Any CPU.Build.0 = Release|Any CPU
{44B3F6C4-0F65-4649-B4CF-6CDC2094E061}.Release|x64.ActiveCfg = Release|Any CPU
{44B3F6C4-0F65-4649-B4CF-6CDC2094E061}.Release|x64.Build.0 = Release|Any CPU
{44B3F6C4-0F65-4649-B4CF-6CDC2094E061}.Release|x86.ActiveCfg = Release|Any CPU
{44B3F6C4-0F65-4649-B4CF-6CDC2094E061}.Release|x86.Build.0 = Release|Any CPU
{7CB23DCD-B416-4293-9848-224077F9E71D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7CB23DCD-B416-4293-9848-224077F9E71D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7CB23DCD-B416-4293-9848-224077F9E71D}.Debug|x64.ActiveCfg = Debug|Any CPU
{7CB23DCD-B416-4293-9848-224077F9E71D}.Debug|x64.Build.0 = Debug|Any CPU
{7CB23DCD-B416-4293-9848-224077F9E71D}.Debug|x86.ActiveCfg = Debug|Any CPU
{7CB23DCD-B416-4293-9848-224077F9E71D}.Debug|x86.Build.0 = Debug|Any CPU
{7CB23DCD-B416-4293-9848-224077F9E71D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7CB23DCD-B416-4293-9848-224077F9E71D}.Release|Any CPU.Build.0 = Release|Any CPU
{7CB23DCD-B416-4293-9848-224077F9E71D}.Release|x64.ActiveCfg = Release|Any CPU
{7CB23DCD-B416-4293-9848-224077F9E71D}.Release|x64.Build.0 = Release|Any CPU
{7CB23DCD-B416-4293-9848-224077F9E71D}.Release|x86.ActiveCfg = Release|Any CPU
{7CB23DCD-B416-4293-9848-224077F9E71D}.Release|x86.Build.0 = Release|Any CPU
{69637901-CAD7-4335-81F4-92E03C4DA354}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{69637901-CAD7-4335-81F4-92E03C4DA354}.Debug|Any CPU.Build.0 = Debug|Any CPU
{69637901-CAD7-4335-81F4-92E03C4DA354}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -5449,18 +5387,6 @@ Global
{2A3B2388-F9F3-4F28-B008-2CD7862A86C4}.Release|x64.Build.0 = Release|Any CPU
{2A3B2388-F9F3-4F28-B008-2CD7862A86C4}.Release|x86.ActiveCfg = Release|Any CPU
{2A3B2388-F9F3-4F28-B008-2CD7862A86C4}.Release|x86.Build.0 = Release|Any CPU
{930CB054-3E69-4721-9F7E-01FB911AAF6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{930CB054-3E69-4721-9F7E-01FB911AAF6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{930CB054-3E69-4721-9F7E-01FB911AAF6A}.Debug|x64.ActiveCfg = Debug|Any CPU
{930CB054-3E69-4721-9F7E-01FB911AAF6A}.Debug|x64.Build.0 = Debug|Any CPU
{930CB054-3E69-4721-9F7E-01FB911AAF6A}.Debug|x86.ActiveCfg = Debug|Any CPU
{930CB054-3E69-4721-9F7E-01FB911AAF6A}.Debug|x86.Build.0 = Debug|Any CPU
{930CB054-3E69-4721-9F7E-01FB911AAF6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{930CB054-3E69-4721-9F7E-01FB911AAF6A}.Release|Any CPU.Build.0 = Release|Any CPU
{930CB054-3E69-4721-9F7E-01FB911AAF6A}.Release|x64.ActiveCfg = Release|Any CPU
{930CB054-3E69-4721-9F7E-01FB911AAF6A}.Release|x64.Build.0 = Release|Any CPU
{930CB054-3E69-4721-9F7E-01FB911AAF6A}.Release|x86.ActiveCfg = Release|Any CPU
{930CB054-3E69-4721-9F7E-01FB911AAF6A}.Release|x86.Build.0 = Release|Any CPU
{31B7D2B1-47AF-432B-BF07-73916EF238EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{31B7D2B1-47AF-432B-BF07-73916EF238EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{31B7D2B1-47AF-432B-BF07-73916EF238EE}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -7991,9 +7917,6 @@ Global
{1CBCF1F9-D90D-484E-A2E9-FD4E4174C05E} = {B27FBAC2-ADA3-4A05-B232-64011B6B2DA3}
{A6323D64-C883-46B6-BDA9-916009D44262} = {1CBCF1F9-D90D-484E-A2E9-FD4E4174C05E}
{313ADEF5-5A2D-4C11-8655-E227445144E2} = {1CBCF1F9-D90D-484E-A2E9-FD4E4174C05E}
{B9704650-5360-416C-9393-FAF707766AA8} = {B27FBAC2-ADA3-4A05-B232-64011B6B2DA3}
{4C84173F-5C1F-49A1-895A-C0CA11DE84B1} = {B9704650-5360-416C-9393-FAF707766AA8}
{FE095F11-4CD2-406D-A2BB-1BE569603BF0} = {B9704650-5360-416C-9393-FAF707766AA8}
{3854EA4A-5530-4FEC-971E-B0CB45C5B19D} = {B27FBAC2-ADA3-4A05-B232-64011B6B2DA3}
{AE06A841-F90D-486A-9DEF-70495DF4D28A} = {3854EA4A-5530-4FEC-971E-B0CB45C5B19D}
{91A6A69B-21B4-4B05-B188-D0551573DD9B} = {3854EA4A-5530-4FEC-971E-B0CB45C5B19D}
Expand All @@ -8002,17 +7925,13 @@ Global
{8B37B987-B7A2-4A26-8CF1-7AC1E9FA7ADC} = {F6E6A63A-45BE-46BF-B9B4-DA3DDC8FE4B5}
{D510860C-B2DA-41D3-9137-81B029312E71} = {B27FBAC2-ADA3-4A05-B232-64011B6B2DA3}
{8ED505A5-A33A-401E-89BA-3AED7B73DD6A} = {D510860C-B2DA-41D3-9137-81B029312E71}
{DA9E1AB0-0094-4777-BF3F-BC5596C3CDA9} = {B27FBAC2-ADA3-4A05-B232-64011B6B2DA3}
{44B3F6C4-0F65-4649-B4CF-6CDC2094E061} = {DA9E1AB0-0094-4777-BF3F-BC5596C3CDA9}
{7CB23DCD-B416-4293-9848-224077F9E71D} = {DA9E1AB0-0094-4777-BF3F-BC5596C3CDA9}
{06C916C7-67BF-45DC-9D0B-CEEF0C731451} = {B27FBAC2-ADA3-4A05-B232-64011B6B2DA3}
{69637901-CAD7-4335-81F4-92E03C4DA354} = {06C916C7-67BF-45DC-9D0B-CEEF0C731451}
{ED060C25-B7B2-414B-BDC7-A77FA0269C9F} = {06C916C7-67BF-45DC-9D0B-CEEF0C731451}
{4C152E79-DF16-4CAA-A98D-1A46604C6D22} = {06C916C7-67BF-45DC-9D0B-CEEF0C731451}
{F8111E2B-650F-4A9A-9834-234B5F5DD79D} = {06C916C7-67BF-45DC-9D0B-CEEF0C731451}
{302EC23A-FD11-4F56-B3E9-0DEC7C177584} = {06C916C7-67BF-45DC-9D0B-CEEF0C731451}
{2A3B2388-F9F3-4F28-B008-2CD7862A86C4} = {06C916C7-67BF-45DC-9D0B-CEEF0C731451}
{930CB054-3E69-4721-9F7E-01FB911AAF6A} = {DA9E1AB0-0094-4777-BF3F-BC5596C3CDA9}
{CF9D35EC-CA9B-481D-BAAC-5D4654732AB9} = {A39335E5-7A26-4CFD-BF3B-2CFE75113498}
{31B7D2B1-47AF-432B-BF07-73916EF238EE} = {CF9D35EC-CA9B-481D-BAAC-5D4654732AB9}
{C75B1FB3-6BB7-411A-B76C-06E5E0C3D957} = {A39335E5-7A26-4CFD-BF3B-2CFE75113498}
Expand Down
2 changes: 0 additions & 2 deletions eng/ProjectReferences.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,7 @@
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X" ProjectPath="$(RepoRoot)src\Razor\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" ProjectPath="$(RepoRoot)src\Razor\Microsoft.AspNetCore.Mvc.Razor.Extensions\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Razor.Language" ProjectPath="$(RepoRoot)src\Razor\Microsoft.AspNetCore.Razor.Language\src\Microsoft.AspNetCore.Razor.Language.csproj" />
<ProjectReferenceProvider Include="rzc" ProjectPath="$(RepoRoot)src\Razor\Microsoft.AspNetCore.Razor.Tools\src\rzc.csproj" />
<ProjectReferenceProvider Include="Microsoft.CodeAnalysis.Razor" ProjectPath="$(RepoRoot)src\Razor\Microsoft.CodeAnalysis.Razor\src\Microsoft.CodeAnalysis.Razor.csproj" />
<ProjectReferenceProvider Include="Microsoft.NET.Sdk.Razor" ProjectPath="$(RepoRoot)src\Razor\Microsoft.NET.Sdk.Razor\src\Microsoft.NET.Sdk.Razor.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Razor.Runtime" ProjectPath="$(RepoRoot)src\Razor\Razor.Runtime\src\Microsoft.AspNetCore.Razor.Runtime.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Razor" ProjectPath="$(RepoRoot)src\Razor\Razor\src\Microsoft.AspNetCore.Razor.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Abstractions" ProjectPath="$(RepoRoot)src\Mvc\Mvc.Abstractions\src\Microsoft.AspNetCore.Mvc.Abstractions.csproj" />
Expand Down
24 changes: 0 additions & 24 deletions eng/targets/CSharp.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,6 @@
<PackageReference Include="MicroBuild.Core" Version="0.3.0" PrivateAssets="All" AllowExplicitReference="true" ExcludeAssets="All" />
</ItemGroup>

<PropertyGroup>
<_ReferenceLocalRazorSDK
Condition="'$(UsingMicrosoftNETSdkWeb)' == 'true' OR '$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true' OR '$(RazorSdkCurrentVersionProps)' != '' OR '$(_RazorSdkImportsMicrosoftNetSdk)' == 'true'">true</_ReferenceLocalRazorSDK>
</PropertyGroup>

<ItemGroup Condition="'$(_ReferenceLocalRazorSDK)' == 'true'">
<!--
Use the Razor SDK as a project reference. The version of the .NET Core SDK we build with often contains a version of the Razor SDK
several versions older than latest. We reference the project to ensure it's built before the other projects that use it. Since this
is a project reference, we must explicitly import the props file and also specify the output location of the SDK directory.
-->
<Reference Include="Microsoft.NET.Sdk.Razor"
PrivateAssets="All"
ReferenceOutputAssembly="false"
SkipGetTargetFrameworkProperties="true"
UndefineProperties="TargetFramework;TargetFrameworks" />
</ItemGroup>

<ImportGroup Condition="'$(_ReferenceLocalRazorSDK)' == 'true'">
<Import Project="$(RepoRoot)eng\targets\GetRazorSDKDirectory.props" />
<Import Project="$(RepoRoot)src\Razor\Microsoft.NET.Sdk.Razor\src\build\netstandard2.0\Microsoft.NET.Sdk.Razor.props" />
</ImportGroup>


<ItemGroup Condition=" '$(IsTestProject)' != 'true' AND '$(DotNetBuildFromSource)' != 'true' ">
<Reference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" PrivateAssets="All" />
</ItemGroup>
Expand Down
5 changes: 0 additions & 5 deletions eng/targets/GetRazorSDKDirectory.props
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"sdk": {
"version": "6.0.100-alpha.1.21063.4"
"version": "6.0.100-preview.1.21073.4"
},
"tools": {
"dotnet": "6.0.100-alpha.1.21063.4",
"dotnet": "6.0.100-preview.1.21073.4",
"runtimes": {
"dotnet/x64": [
"2.1.23",
Expand Down
4 changes: 1 addition & 3 deletions src/Framework/Framework.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,7 @@
"src\\ObjectPool\\src\\Microsoft.Extensions.ObjectPool.csproj",
"src\\Razor\\Microsoft.AspNetCore.Mvc.Razor.Extensions\\src\\Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj",
"src\\Razor\\Microsoft.AspNetCore.Razor.Language\\src\\Microsoft.AspNetCore.Razor.Language.csproj",
"src\\Razor\\Microsoft.AspNetCore.Razor.Tools\\src\\rzc.csproj",
"src\\Razor\\Microsoft.CodeAnalysis.Razor\\src\\Microsoft.CodeAnalysis.Razor.csproj",
"src\\Razor\\Microsoft.NET.Sdk.Razor\\src\\Microsoft.NET.Sdk.Razor.csproj",
"src\\Razor\\Razor.Runtime\\src\\Microsoft.AspNetCore.Razor.Runtime.csproj",
"src\\Razor\\Razor\\src\\Microsoft.AspNetCore.Razor.csproj",
"src\\Security\\Authentication\\Cookies\\src\\Microsoft.AspNetCore.Authentication.Cookies.csproj",
Expand All @@ -101,4 +99,4 @@
"src\\WebEncoders\\src\\Microsoft.Extensions.WebEncoders.csproj"
]
}
}
}
1 change: 0 additions & 1 deletion src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
<ProjectReference Include="$(RepoRoot)src\Hosting\Server.IntegrationTesting\src\Microsoft.AspNetCore.Server.IntegrationTesting.csproj" />
<ProjectReference Include="../testassets/DotNetToolsInstaller/DotNetToolsInstaller.csproj" ReferenceOutputAssembly="false" />
<ProjectReference Include="../Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj" ReferenceOutputAssembly="false" />
<Reference Include="Microsoft.NET.Sdk.Razor" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
</ItemGroup>

<!-- Shared testing infrastructure for running E2E tests using selenium -->
Expand Down
12 changes: 0 additions & 12 deletions src/ProjectTemplates/TestInfrastructure/Directory.Build.targets.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,4 @@
<!-- This sets an option which prevents the tests from rolling forward into a newer shared framework. -->
<UserRuntimeConfig>$(MSBuildThisFileDirectory)runtimeconfig.norollforward.json</UserRuntimeConfig>
</PropertyGroup>

<!--
The version of the .NET Core SDK we build with often contains a version of the Razor SDK several versions older
than latest. We reference the project (see CSharp.Common.props) to ensure it's built before projects that use it.
Since this is a project reference, we must explicitly import the props file and also specify the output location
of the SDK directory.
-->
<PropertyGroup>
<RazorSdkDirectoryRoot>$(ArtifactsBinDir)Microsoft.NET.Sdk.Razor\${Configuration}\sdk-output\</RazorSdkDirectoryRoot>
</PropertyGroup>
<Import Project="$(RepoRoot)src\Razor\Microsoft.NET.Sdk.Razor\src\build\netstandard2.0\Microsoft.NET.Sdk.Razor.props"
Condition="'$(UsingMicrosoftNETSdkWeb)' == 'true' OR '$(RazorSdkCurrentVersionProps)' != ''" />
</Project>
2 changes: 0 additions & 2 deletions src/ProjectTemplates/test/ProjectTemplates.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

<!-- Shared testing infrastructure for running E2E tests using selenium -->
<Import Project="$(SharedSourceRoot)E2ETesting\E2ETesting.props" />
<Import Project="$(RepoRoot)eng\targets\GetRazorSDKDirectory.props" Condition="'$(IsHelixJob)' != 'true'"/>

<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
Expand Down Expand Up @@ -51,7 +50,6 @@
<ProjectReference Include="../Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj" ReferenceOutputAssembly="false" />
<ProjectReference Include="../Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj" ReferenceOutputAssembly="false" />
<ProjectReference Include="../Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj" ReferenceOutputAssembly="false" />
<Reference Include="Microsoft.NET.Sdk.Razor" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
</ItemGroup>

<PropertyGroup>
Expand Down
Loading