Skip to content

Commit 647fbba

Browse files
ajaybhargavbajaybhargavb
committed
Merge branch 'release/2.1' into ajbaaska/merge-22
2 parents da72ac6 + b079041 commit 647fbba

File tree

4,348 files changed

+837
-1279
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,348 files changed

+837
-1279
lines changed

‎Directory.Build.targets

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

5656
<Import Project="eng\targets\Cpp.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.vcxproj'" />
5757
<Import Project="eng\targets\CSharp.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.csproj'" />
58+
<Import Project="eng\targets\FSharp.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.fsproj'" />
5859
<Import Project="eng\targets\SharedFx.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.shfxproj'" />
5960
<Import Project="eng\targets\Wix.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.wixproj'" />
6061
</Project>

‎build/artifacts.props

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@
114114
<PackageArtifact Include="Microsoft.AspNetCore.Razor.Design" Category="ship" />
115115
<PackageArtifact Include="Microsoft.AspNetCore.Razor.Language" Category="ship" />
116116
<PackageArtifact Include="Microsoft.AspNetCore.Razor.Runtime" Category="ship" />
117-
<PackageArtifact Include="Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources" Category="noship" />
118117
<PackageArtifact Include="Microsoft.AspNetCore.Razor" Category="ship" />
119118
<PackageArtifact Include="Microsoft.AspNetCore.ResponseCaching.Abstractions" Category="ship" />
120119
<PackageArtifact Include="Microsoft.AspNetCore.ResponseCaching" Category="ship" />
@@ -189,7 +188,6 @@
189188
<PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration" Category="ship" />
190189
<PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGenerators.Mvc" Category="ship" />
191190
<PackageArtifact Include="Microsoft.Web.Xdt.Extensions" Category="shipoob" />
192-
<PackageArtifact Include="RazorPageGenerator" Category="noship" />
193191

194192
<PackageArtifact Include="Internal.WebHostBuilderFactory.Sources" Category="noship"/>
195193
</ItemGroup>

‎build/buildorder.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
</ItemDefinitionGroup>
88

99
<ItemGroup>
10-
<RepositoryBuildOrder Include="Razor" Order="6" RootPath="$(RepositoryRoot)src\Razor\" />
1110
<RepositoryBuildOrder Include="EntityFrameworkCore" Order="8" />
1211
<RepositoryBuildOrder Include="ServerTests" Order="11" RootPath="$(RepositoryRoot)src\ServerTests\" />
1312
<RepositoryBuildOrder Include="Mvc" Order="14" RootPath="$(RepositoryRoot)src\Mvc\" />

‎build/repo.props

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@
6666
<!-- Exclude the websockets samples for now because they use classic .csproj, which is not yet supported in our build. -->
6767
<ProjectToExclude Include="
6868
$(RepositoryRoot)src\Middleware\WebSockets\samples\**\*.csproj;
69-
$(RepositoryRoot)src\Tools\dotnet-watch\test\TestProjects\**\*.csproj
69+
$(RepositoryRoot)src\Tools\dotnet-watch\test\TestProjects\**\*.csproj;
70+
$(RepositoryRoot)src\Razor\Razor.Design\test\testassets\**\*.*proj
7071
" />
7172

7273
<NpmProjectDirectory Include="$(RepositoryRoot)src\Middleware\CORS\test\FunctionalTests\" />
@@ -91,6 +92,7 @@
9192
$(RepositoryRoot)src\Shared\**\*.*proj;
9293
$(RepositoryRoot)src\Tools\**\*.*proj;
9394
$(RepositoryRoot)src\Middleware\**\*.*proj;
95+
$(RepositoryRoot)src\Razor\**\*.*proj;
9496
"
9597
Exclude="
9698
@(ProjectToExclude);

‎build/submodules.props

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@
5454
<ShippedRepository Include="JavaScriptServices" RootPath="$(RepositoryRoot)src\JavaScriptServices\" />
5555
<ShippedRepository Include="MetaPackages" RootPath="$(RepositoryRoot)src\MetaPackages\" PatchPolicy="CascadeVersions" />
5656
<ShippedRepository Include="Mvc" RootPath="$(RepositoryRoot)src\Mvc\" />
57-
<ShippedRepository Include="MvcPrecompilation" RootPath="$(RepositoryRoot)src\MvcPrecompilation\" />
58-
<ShippedRepository Include="Razor" RootPath="$(RepositoryRoot)src\Razor\" />
57+
<ShippedRepository Include="MvcPrecompilation" RootPath="$(RepositoryRoot)src\MvcPrecompilation\"/>
5958
<ShippedRepository Include="SignalR" RootPath="$(RepositoryRoot)src\SignalR\" />
6059
</ItemGroup>
6160
</Project>

‎eng/Baseline.Designer.props

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -459,13 +459,51 @@
459459
<BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[2.2.0, )" />
460460
<BaselinePackageReference Include="System.Diagnostics.DiagnosticSource" Version="[4.5.0, )" />
461461
</ItemGroup>
462+
<!-- Package: Microsoft.AspNetCore.Mvc.Razor.Extensions-->
463+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Razor.Extensions' ">
464+
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
465+
</PropertyGroup>
466+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Razor.Extensions' AND '$(TargetFramework)' == 'net46' ">
467+
<BaselinePackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="[2.2.0, )" />
468+
<BaselinePackageReference Include="Microsoft.CodeAnalysis.Razor" Version="[2.2.0, )" />
469+
</ItemGroup>
470+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Razor.Extensions' AND '$(TargetFramework)' == 'netstandard2.0' ">
471+
<BaselinePackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="[2.2.0, )" />
472+
<BaselinePackageReference Include="Microsoft.CodeAnalysis.Razor" Version="[2.2.0, )" />
473+
</ItemGroup>
462474
<!-- Package: Microsoft.AspNetCore.Owin-->
463475
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Owin' ">
464476
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
465477
</PropertyGroup>
466478
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Owin' AND '$(TargetFramework)' == 'netstandard2.0' ">
467479
<BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.2.0, )" />
468480
</ItemGroup>
481+
<!-- Package: Microsoft.AspNetCore.Razor-->
482+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Razor' ">
483+
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
484+
</PropertyGroup>
485+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Razor' AND '$(TargetFramework)' == 'netstandard2.0' ">
486+
<BaselinePackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="[2.2.0, )" />
487+
</ItemGroup>
488+
<!-- Package: Microsoft.AspNetCore.Razor.Design-->
489+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Razor.Design' ">
490+
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
491+
</PropertyGroup>
492+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Razor.Design' AND '$(TargetFramework)' == 'netstandard2.0' " />
493+
<!-- Package: Microsoft.AspNetCore.Razor.Language-->
494+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Razor.Language' ">
495+
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
496+
</PropertyGroup>
497+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Razor.Language' AND '$(TargetFramework)' == 'net46' " />
498+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Razor.Language' AND '$(TargetFramework)' == 'netstandard2.0' " />
499+
<!-- Package: Microsoft.AspNetCore.Razor.Runtime-->
500+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Razor.Runtime' ">
501+
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
502+
</PropertyGroup>
503+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Razor.Runtime' AND '$(TargetFramework)' == 'netstandard2.0' ">
504+
<BaselinePackageReference Include="Microsoft.AspNetCore.Razor" Version="[2.2.0, )" />
505+
<BaselinePackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="[2.2.0, )" />
506+
</ItemGroup>
469507
<!-- Package: Microsoft.AspNetCore.ResponseCaching.Abstractions-->
470508
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ResponseCaching.Abstractions' ">
471509
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
@@ -717,6 +755,21 @@
717755
<BaselinePackageReference Include="Microsoft.Net.Http.Headers" Version="[2.2.0, )" />
718756
<BaselinePackageReference Include="System.Text.Encodings.Web" Version="[4.5.0, )" />
719757
</ItemGroup>
758+
<!-- Package: Microsoft.CodeAnalysis.Razor-->
759+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.CodeAnalysis.Razor' ">
760+
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
761+
</PropertyGroup>
762+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.CodeAnalysis.Razor' AND '$(TargetFramework)' == 'net46' ">
763+
<BaselinePackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="[2.2.0, )" />
764+
<BaselinePackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="[2.8.0, )" />
765+
<BaselinePackageReference Include="Microsoft.CodeAnalysis.Common" Version="[2.8.0, )" />
766+
<BaselinePackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="[4.3.0, )" />
767+
</ItemGroup>
768+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.CodeAnalysis.Razor' AND '$(TargetFramework)' == 'netstandard2.0' ">
769+
<BaselinePackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="[2.2.0, )" />
770+
<BaselinePackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="[2.8.0, )" />
771+
<BaselinePackageReference Include="Microsoft.CodeAnalysis.Common" Version="[2.8.0, )" />
772+
</ItemGroup>
720773
<!-- Package: Microsoft.AspNetCore-->
721774
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore' ">
722775
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
@@ -758,6 +811,12 @@
758811
<BaselinePackageReference Include="Microsoft.Extensions.Primitives" Version="[2.2.0, )" />
759812
<BaselinePackageReference Include="System.Buffers" Version="[4.5.0, )" />
760813
</ItemGroup>
814+
<!-- Package: Microsoft.Net.Sdk.Razor-->
815+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Net.Sdk.Razor' ">
816+
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
817+
</PropertyGroup>
818+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Net.Sdk.Razor' AND '$(TargetFramework)' == 'net46' " />
819+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Net.Sdk.Razor' AND '$(TargetFramework)' == 'netstandard2.0' " />
761820
<!-- Package: Microsoft.Owin.Security.Interop-->
762821
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Owin.Security.Interop' ">
763822
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>

‎eng/Baseline.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,12 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
5959
<Package Id="Microsoft.AspNetCore.Localization.Routing" Version="2.2.0" />
6060
<Package Id="Microsoft.AspNetCore.Localization" Version="2.2.0" />
6161
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="2.2.0" />
62+
<Package Id="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="2.2.0" />
6263
<Package Id="Microsoft.AspNetCore.Owin" Version="2.2.0" />
64+
<Package Id="Microsoft.AspNetCore.Razor" Version="2.2.0" />
65+
<Package Id="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" />
66+
<Package Id="Microsoft.AspNetCore.Razor.Language" Version="2.2.0" />
67+
<Package Id="Microsoft.AspNetCore.Razor.Runtime" Version="2.2.0" />
6368
<Package Id="Microsoft.AspNetCore.ResponseCaching.Abstractions" Version="2.2.0" />
6469
<Package Id="Microsoft.AspNetCore.ResponseCaching" Version="2.2.0" />
6570
<Package Id="Microsoft.AspNetCore.ResponseCompression" Version="2.2.0" />
@@ -80,8 +85,10 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
8085
<Package Id="Microsoft.AspNetCore.TestHost" Version="2.2.0" />
8186
<Package Id="Microsoft.AspNetCore.WebSockets" Version="2.2.0" />
8287
<Package Id="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
88+
<Package Id="Microsoft.CodeAnalysis.Razor" Version="2.2.0" />
8389
<Package Id="Microsoft.AspNetCore" Version="2.2.0" />
8490
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="2.2.0" />
8591
<Package Id="Microsoft.Net.Http.Headers" Version="2.2.0" />
92+
<Package Id="Microsoft.Net.Sdk.Razor" Version="2.2.0" />
8693
<Package Id="Microsoft.Owin.Security.Interop" Version="2.2.0" />
8794
</Baseline>

‎eng/Dependencies.props

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ and are generated based on the last package release.
2323
<ItemGroup Label="ProdCon dependencies">
2424
<LatestPackageReference Include="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="$(MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion)" />
2525
<LatestPackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
26+
<LatestPackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" />
27+
<LatestPackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" />
28+
<LatestPackageReference Include="Microsoft.CodeAnalysis.Common" Version="$(MicrosoftCodeAnalysisCommonPackageVersion)" />
29+
<LatestPackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
2630
<LatestPackageReference Include="Microsoft.CSharp" Version="$(MicrosoftCSharpPackageVersion)" />
2731
<LatestPackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(MicrosoftEntityFrameworkCoreInMemoryPackageVersion)" />
2832
<LatestPackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftEntityFrameworkCoreRelationalPackageVersion)" />
@@ -39,6 +43,7 @@ and are generated based on the last package release.
3943
<LatestPackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="$(MicrosoftExtensionsConfigurationUserSecretsPackageVersion)" />
4044
<LatestPackageReference Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsConfigurationPackageVersion)" />
4145
<LatestPackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
46+
<LatestPackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
4247
<LatestPackageReference Include="Microsoft.Extensions.DiagnosticAdapter" Version="$(MicrosoftExtensionsDiagnosticAdapterPackageVersion)" />
4348
<LatestPackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion)" />
4449
<LatestPackageReference Include="Microsoft.Extensions.HashCodeCombiner.Sources" Version="$(MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion)" />
@@ -63,6 +68,7 @@ and are generated based on the last package release.
6368
<LatestPackageReference Include="Microsoft.Web.Administration" Version="$(MicrosoftWebAdministrationPackageVersion)" />
6469
<LatestPackageReference Include="System.Buffers" Version="$(SystemBuffersPackageVersion)" />
6570
<LatestPackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientPackageVersion)" />
71+
<LatestPackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
6672
<LatestPackageReference Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogPackageVersion)" />
6773
<LatestPackageReference Include="System.IO.Pipelines" Version="$(SystemIOPipelinesPackageVersion)" />
6874
<LatestPackageReference Include="System.Memory" Version="$(SystemMemoryPackageVersion)" />

‎eng/ProjectReferences.props

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,5 +87,20 @@
8787
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Session" ProjectPath="$(RepositoryRoot)src\Middleware\Session\src\Microsoft.AspNetCore.Session.csproj" />
8888
<ProjectReferenceProvider Include="Microsoft.AspNetCore.StaticFiles" ProjectPath="$(RepositoryRoot)src\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj" />
8989
<ProjectReferenceProvider Include="Microsoft.AspNetCore.WebSockets" ProjectPath="$(RepositoryRoot)src\Middleware\WebSockets\src\Microsoft.AspNetCore.WebSockets.csproj" />
90+
<ProjectReferenceProvider Include="Microsoft.CodeAnalysis.Razor" ProjectPath="$(RepositoryRoot)src\Razor\CodeAnalysis.Razor\src\Microsoft.CodeAnalysis.Razor.csproj" />
91+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X" ProjectPath="$(RepositoryRoot)src\Razor\Mvc.Razor.Extensions.Version1_X\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj" />
92+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" ProjectPath="$(RepositoryRoot)src\Razor\Mvc.Razor.Extensions\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj" />
93+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Razor.Design" ProjectPath="$(RepositoryRoot)src\Razor\Razor.Design\src\Microsoft.AspNetCore.Razor.Design.csproj" />
94+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Razor.Language" ProjectPath="$(RepositoryRoot)src\Razor\Razor.Language\src\Microsoft.AspNetCore.Razor.Language.csproj" />
95+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Razor.Runtime" ProjectPath="$(RepositoryRoot)src\Razor\Razor.Runtime\src\Microsoft.AspNetCore.Razor.Runtime.csproj" />
96+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Razor.Tasks" ProjectPath="$(RepositoryRoot)src\Razor\Razor.Tasks\src\Microsoft.AspNetCore.Razor.Tasks.csproj" />
97+
<ProjectReferenceProvider Include="rzc" ProjectPath="$(RepositoryRoot)src\Razor\Razor.Tools\src\rzc.csproj" />
98+
<ProjectReferenceProvider Include="dotnet-razorpagegenerator" ProjectPath="$(RepositoryRoot)src\Razor\RazorPageGenerator\src\dotnet-razorpagegenerator.csproj" />
99+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Razor" ProjectPath="$(RepositoryRoot)src\Razor\Razor\src\Microsoft.AspNetCore.Razor.csproj" />
100+
<ProjectReferenceProvider Include="Microsoft.NET.Sdk.Razor" ProjectPath="$(RepositoryRoot)src\Razor\Sdk.Razor\src\Microsoft.NET.Sdk.Razor.csproj" />
101+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Razor.Test.Common" ProjectPath="$(RepositoryRoot)src\Razor\test\testassets\Razor.Test.Common\Microsoft.AspNetCore.Razor.Test.Common.csproj" />
102+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib" ProjectPath="$(RepositoryRoot)src\Razor\test\testassets\Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj" />
103+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X" ProjectPath="$(RepositoryRoot)src\Razor\test\testassets\Razor.Test.MvcShim.Version1_X\Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj" />
104+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Razor.Test.MvcShim" ProjectPath="$(RepositoryRoot)src\Razor\test\testassets\Razor.Test.MvcShim\Microsoft.AspNetCore.Razor.Test.MvcShim.csproj" />
90105
</ItemGroup>
91106
</Project>

‎eng/targets/CSharp.Common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
1212
</ItemGroup>
1313

14-
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' ">
14+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' AND '$(OS)' != 'Windows_NT' ">
1515
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="$(MicrosoftNETFrameworkReferenceAssembliesPackageVersion)" PrivateAssets="All" />
1616
</ItemGroup>
1717

0 commit comments

Comments
 (0)