Skip to content

Commit b102290

Browse files
ryzngardryzngard
authored
Upgrade to net9 (#11535)
1 parent e0517b8 commit b102290

File tree

47 files changed

+84
-84
lines changed

Some content is hidden

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

47 files changed

+84
-84
lines changed

‎Directory.Build.props

+10-15
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,10 @@
4646
<!-- By default, nothing builds from source build. Individual projects can opt in instead -->
4747
<ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
4848

49-
<DefaultNetFxTargetFramework>net472</DefaultNetFxTargetFramework>
49+
<NetFxVS>net472</NetFxVS>
50+
<NetVS>net8.0</NetVS>
51+
<NetVSCode>net9.0</NetVSCode>
52+
<NetVSAndVSCode>$(NetVS);$(NetVSCode)</NetVSAndVSCode>
5053
</PropertyGroup>
5154

5255
<!--
@@ -61,8 +64,9 @@
6164
-->
6265
<When Condition="'$(DotNetBuildSourceOnly)' == 'true' AND '$(DotNetBuildOrchestrator)' != 'true'">
6366
<PropertyGroup>
64-
<DefaultNetCoreTargetFramework>$(NetCurrent)</DefaultNetCoreTargetFramework>
65-
<DefaultNetCoreTargetFrameworks>$(DefaultNetCoreTargetFramework);$(NetPrevious)</DefaultNetCoreTargetFrameworks>
67+
<NetVS>$(NetCurrent)</NetVS>
68+
<NetVSCode>$(NetCurrent)</NetVSCode>
69+
<NetVSAndVSCode>$(NetVS);$(NetVSCode);$(NetPrevious)</NetVSAndVSCode>
6670
</PropertyGroup>
6771
</When>
6872

@@ -71,20 +75,11 @@
7175
-->
7276
<When Condition="'$(DotNetBuildSourceOnly)' == 'true' AND '$(DotNetBuildOrchestrator)' == 'true'">
7377
<PropertyGroup>
74-
<DefaultNetCoreTargetFramework>$(NetCurrent)</DefaultNetCoreTargetFramework>
75-
<DefaultNetCoreTargetFrameworks>$(DefaultNetCoreTargetFramework)</DefaultNetCoreTargetFrameworks>
78+
<NetVS>$(NetCurrent)</NetVS>
79+
<NetVSCode>$(NetCurrent)</NetVSCode>
80+
<NetVSAndVSCode>$(NetVS);$(NetVSCode)</NetVSAndVSCode>
7681
</PropertyGroup>
7782
</When>
78-
79-
<!--
80-
3. Everything else including normal CI, developer machines and official builds.
81-
-->
82-
<Otherwise>
83-
<PropertyGroup>
84-
<DefaultNetCoreTargetFramework>net8.0</DefaultNetCoreTargetFramework>
85-
<DefaultNetCoreTargetFrameworks>$(DefaultNetCoreTargetFramework)</DefaultNetCoreTargetFrameworks>
86-
</PropertyGroup>
87-
</Otherwise>
8883
</Choose>
8984

9085
<ItemGroup>

‎Directory.Build.targets

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
If a C# file should only be compiled under NetFx, it can be named with a ".NetFx.cs" extension.
5555
Or, the file can be included in a folder called "NetFx" or has a name that ends in "_NetFx".
5656
-->
57-
<ItemGroup Condition="'$(TargetFramework)' != '$(DefaultNetFxTargetFramework)'">
57+
<ItemGroup Condition="'$(TargetFramework)' != '$(NetFxVS)'">
5858
<Compile Remove="**\*.NetFx.cs" />
5959
<Compile Remove="**\NetFx\**\*.*" />
6060
<Compile Remove="**\*_NetFx\**\*.*" />
@@ -69,7 +69,7 @@
6969
If a C# file should only be compiled under NetCore, it can be named with a ".NetCore.cs" extension.
7070
Or, the file can be included in a folder called "NetCore" or has a name that ends in "_NetCore".
7171
-->
72-
<ItemGroup Condition="'$(TargetFramework)' != '$(DefaultNetCoreTargetFramework)' AND '$(TargetFramework)' != '$(NetCurrent)' AND '$(TargetFramework)' != '$(NetPrevious)'">
72+
<ItemGroup Condition="'$(TargetFramework)' != '$(NetVS)' AND '$(TargetFramework)' != '$(NetVSCode)' AND '$(TargetFramework)' != '$(NetCurrent)' AND '$(TargetFramework)' != '$(NetPrevious)'">
7373
<Compile Remove="**\*.NetCore.cs" />
7474
<Compile Remove="**\NetCore\**\*.*" />
7575
<Compile Remove="**\*_NetCore\**\*.*" />

‎src/Analyzers/Razor.Diagnostics.Analyzers.Test/Razor.Diagnostics.Analyzers.Test.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(DefaultNetCoreTargetFrameworks)</TargetFrameworks>
5-
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);$(DefaultNetFxTargetFramework)</TargetFrameworks>
4+
<TargetFrameworks>$(NetVSAndVSCode)</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);$(NetFxVS)</TargetFrameworks>
66
<IsShippingPackage>false</IsShippingPackage>
77
</PropertyGroup>
88

‎src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(DefaultNetCoreTargetFrameworks)</TargetFrameworks>
5-
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);$(DefaultNetFxTargetFramework)</TargetFrameworks>
4+
<TargetFrameworks>$(NetVSAndVSCode)</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);$(NetFxVS)</TargetFrameworks>
66
<PreserveCompilationContext>true</PreserveCompilationContext>
77
<DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**</DefaultItemExcludes>
88

‎src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(DefaultNetCoreTargetFrameworks)</TargetFrameworks>
5-
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);$(DefaultNetFxTargetFramework)</TargetFrameworks>
4+
<TargetFrameworks>$(NetVSAndVSCode)</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);$(NetFxVS)</TargetFrameworks>
66
<PreserveCompilationContext>true</PreserveCompilationContext>
77
<DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**</DefaultItemExcludes>
88

‎src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(DefaultNetCoreTargetFrameworks)</TargetFrameworks>
5-
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);$(DefaultNetFxTargetFramework)</TargetFrameworks>
4+
<TargetFrameworks>$(NetVSAndVSCode)</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);$(NetFxVS)</TargetFrameworks>
66
<PreserveCompilationContext>true</PreserveCompilationContext>
77
<DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**</DefaultItemExcludes>
88

‎src/Compiler/Microsoft.AspNetCore.Razor.Language/legacyTest/Microsoft.AspNetCore.Razor.Language.Legacy.Test.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(DefaultNetCoreTargetFrameworks)</TargetFrameworks>
5-
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);$(DefaultNetFxTargetFramework)</TargetFrameworks>
4+
<TargetFrameworks>$(NetVSAndVSCode)</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);$(NetFxVS)</TargetFrameworks>
66
<DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**\*</DefaultItemExcludes>
77

88
<!-- To generate baselines, run tests with /p:GenerateBaselines=true -->

‎src/Compiler/Microsoft.AspNetCore.Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(DefaultNetCoreTargetFrameworks)</TargetFrameworks>
5-
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);$(DefaultNetFxTargetFramework)</TargetFrameworks>
4+
<TargetFrameworks>$(NetVSAndVSCode)</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);$(NetFxVS)</TargetFrameworks>
66
<DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**\*</DefaultItemExcludes>
77

88
<!-- To generate baselines, run tests with /p:GenerateBaselines=true -->

‎src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Microsoft.CodeAnalysis.Razor.Compiler.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor compiler.</Description>
5-
<TargetFrameworks>$(DefaultNetCoreTargetFramework);netstandard2.0</TargetFrameworks>
5+
<TargetFrameworks>$(NetVSAndVSCode);netstandard2.0</TargetFrameworks>
66
<ExcludeFromSourceOnlyBuild>false</ExcludeFromSourceOnlyBuild>
77
<IsPackable>true</IsPackable>
88
<IsShippingAssembly>true</IsShippingAssembly>

‎src/Compiler/Microsoft.CodeAnalysis.Razor/test/Microsoft.CodeAnalysis.Razor.Test.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(DefaultNetCoreTargetFrameworks)</TargetFrameworks>
5-
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);$(DefaultNetFxTargetFramework)</TargetFrameworks>
4+
<TargetFrameworks>$(NetVSAndVSCode)</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);$(NetFxVS)</TargetFrameworks>
66
<DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**\*</DefaultItemExcludes>
77
<PreserveCompilationContext>true</PreserveCompilationContext>
88

‎src/Compiler/perf/Microbenchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks.Compiler.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(DefaultNetCoreTargetFrameworks)</TargetFrameworks>
4+
<TargetFrameworks>$(NetVSAndVSCode)</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
<ServerGarbageCollection>true</ServerGarbageCollection>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

‎src/Compiler/perf/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
5+
<TargetFramework>$(NetVS)</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<Configurations>Debug;Release</Configurations>

‎src/Compiler/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.Compiler.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(DefaultNetCoreTargetFrameworks);$(DefaultNetFxTargetFramework)</TargetFrameworks>
4+
<TargetFrameworks>$(NetVSAndVSCode);$(NetFxVS)</TargetFrameworks>
55
<PreserveCompilationContext>true</PreserveCompilationContext>
66
</PropertyGroup>
77

‎src/Compiler/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.Compiler.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(DefaultNetCoreTargetFrameworks);$(DefaultNetFxTargetFramework)</TargetFrameworks>
4+
<TargetFrameworks>$(NetVSAndVSCode);$(NetFxVS)</TargetFrameworks>
55
<PreserveCompilationContext>true</PreserveCompilationContext>
66
</PropertyGroup>
77

‎src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/Microsoft.NET.Sdk.Razor.SourceGenerators.Test.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<PropertyGroup>
8-
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
8+
<TargetFramework>$(NetVS)</TargetFramework>
99
<PackageId>testSdkRSG</PackageId>
1010
<PreserveCompilationContext>true</PreserveCompilationContext>
1111

‎src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework)</TargetFrameworks>
4+
<TargetFrameworks>$(NetVS);$(NetFxVS)</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
<PlatformTarget>AnyCPU</PlatformTarget>
77
<ServerGarbageCollection>true</ServerGarbageCollection>

‎src/Razor/benchmarks/testapps/LargeProject/LargeProject.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
4+
<TargetFramework>$(NetVS)</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>

‎src/Razor/src/Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor/Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>$(DefaultNetFxTargetFramework)</TargetFramework>
4+
<TargetFramework>$(NetFxVS)</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<NonShipping>true</NonShipping>
@@ -12,7 +12,7 @@
1212
<PackageReference Include="Microsoft.VisualStudio.Shell.Framework" PrivateAssets="all"/>
1313
<!-- Manually upgrade to address CG alert. When the VS packages
1414
pull in the right version, this can be removed. -->
15-
<PackageReference Include="Microsoft.IO.Redist" Condition="'$(TargetFramework)' == '$(DefaultNetFxTargetFramework)'" PrivateAssets="all"/>
15+
<PackageReference Include="Microsoft.IO.Redist" Condition="'$(TargetFramework)' == '$(NetFxVS)'" PrivateAssets="all"/>
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎src/Razor/src/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<!-- needs to be compatible with NetVSCode as defined in Roslyn repo, eng/targets/TargetFrameworks.props -->
4-
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
4+
<TargetFramework>$(NetVSCode)</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

‎src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Microsoft.AspNetCore.Razor.LanguageServer.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(DefaultNetCoreTargetFrameworks);$(DefaultNetFxTargetFramework)</TargetFrameworks>
4+
<TargetFrameworks>$(NetVSAndVSCode);$(NetFxVS)</TargetFrameworks>
55
<Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains the language server library assets.</Description>
66
<EnableApiCheck>false</EnableApiCheck>
77
<IsShippingPackage>false</IsShippingPackage>
@@ -25,7 +25,7 @@
2525
<PackageReference Include="Microsoft.CommonLanguageServerProtocol.Framework" PrivateAssets="all" />
2626
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
2727
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
28-
<PackageReference Include="Microsoft.IO.Redist" Condition="'$(TargetFramework)' == '$(DefaultNetFxTargetFramework)'" />
28+
<PackageReference Include="Microsoft.IO.Redist" Condition="'$(TargetFramework)' == '$(NetFxVS)'" />
2929

3030
<!--
3131
Pinning packages to avoid misaligned reference CI failures.

‎src/Razor/src/Microsoft.AspNetCore.Razor.ProjectEngineHost/Microsoft.AspNetCore.Razor.ProjectEngineHost.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(DefaultNetCoreTargetFrameworks);netstandard2.0;$(DefaultNetFxTargetFramework)</TargetFrameworks>
4+
<TargetFrameworks>$(NetVSAndVSCode);netstandard2.0;$(NetFxVS)</TargetFrameworks>
55
<Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains common assets that are used in the Razor language server and other assemblies.</Description>
66
<RootNamespace>Microsoft.AspNetCore.Razor</RootNamespace>
77
<EnableApiCheck>false</EnableApiCheck>

‎src/Razor/src/Microsoft.AspNetCore.Razor.ProjectEngineHost/Utilities/StreamExtensions.NetCore.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public static void WriteSize(this Stream stream, int length)
103103
public unsafe static int ReadSize(this Stream stream)
104104
{
105105
Span<byte> bytes = stackalloc byte[4];
106-
stream.Read(bytes);
106+
stream.ReadExactly(bytes);
107107
return BitConverter.ToInt32(bytes);
108108
}
109109
}

‎src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Microsoft.CodeAnalysis.Razor.Workspaces.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(DefaultNetCoreTargetFrameworks);netstandard2.0;$(DefaultNetFxTargetFramework)</TargetFrameworks>
4+
<TargetFrameworks>$(NetVSAndVSCode);netstandard2.0;$(NetFxVS)</TargetFrameworks>
55
<Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor design-time infrastructure.</Description>
66
<EnableApiCheck>false</EnableApiCheck>
77
<IsShippingPackage>false</IsShippingPackage>

‎src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor.CoreComponents/Microsoft.CodeAnalysis.Remote.Razor.CoreComponents.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
4+
<TargetFramework>$(NetVS)</TargetFramework>
55
<OutputType>Exe</OutputType>
66

77
<!-- The purpose of this project is to include all dependencies of Microsoft.CodeAnalysis.Remote.Razor targeting .Net Core -->

‎src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Microsoft.CodeAnalysis.Remote.Razor.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(DefaultNetCoreTargetFramework);netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>$(NetVS);netstandard2.0</TargetFrameworks>
55
<Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor design-time infrastructure.</Description>
66
<EnableApiCheck>false</EnableApiCheck>
77
<IsShippingPackage>false</IsShippingPackage>

‎src/Razor/src/Microsoft.VisualStudio.DevKit.Razor/Microsoft.VisualStudio.DevKit.Razor.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
4+
<TargetFramework>$(NetVSCode)</TargetFramework>
55
<OutputType>Library</OutputType>
66
<Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains the language server assets for C# DevKit.</Description>
77
<EnableApiCheck>false</EnableApiCheck>

‎src/Razor/src/Microsoft.VisualStudio.LanguageServer.ContainedLanguage/Microsoft.VisualStudio.LanguageServer.ContainedLanguage.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>$(DefaultNetFxTargetFramework)</TargetFramework>
4+
<TargetFramework>$(NetFxVS)</TargetFramework>
55
<Description>This package contains the Visual Studio Language Server infrastructure for interacting with contained languages.</Description>
66
<EnableApiCheck>false</EnableApiCheck>
77
<IsShippingPackage>false</IsShippingPackage>
@@ -17,7 +17,7 @@
1717
<PackageReference Include="Microsoft.VisualStudio.LanguageServer.Client.Implementation" />
1818
<!-- Manually upgrade to address CG alert. When the VS packages
1919
pull in the right version, this can be removed. -->
20-
<PackageReference Include="Microsoft.IO.Redist" Condition="'$(TargetFramework)' == '$(DefaultNetFxTargetFramework)'" />
20+
<PackageReference Include="Microsoft.IO.Redist" Condition="'$(TargetFramework)' == '$(NetFxVS)'" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

‎src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>$(DefaultNetFxTargetFramework)</TargetFramework>
4+
<TargetFramework>$(NetFxVS)</TargetFramework>
55
<Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor design-time infrastructure for Visual Studio.</Description>
66
<EnableApiCheck>false</EnableApiCheck>
77
<RulesDirectory>$(PkgMicrosoft_NET_Sdk_Razor)\build\netstandard2.0\Rules\</RulesDirectory>
@@ -30,7 +30,7 @@
3030
<PackageReference Include="Microsoft.VisualStudio.Shell.15.0" />
3131
<!-- Manually upgrade to address CG alert. When the VS packages
3232
pull in the right version, this can be removed. -->
33-
<PackageReference Include="Microsoft.IO.Redist" Condition="'$(TargetFramework)' == '$(DefaultNetFxTargetFramework)'" />
33+
<PackageReference Include="Microsoft.IO.Redist" Condition="'$(TargetFramework)' == '$(NetFxVS)'" />
3434

3535
<!--
3636
Pinning packages to avoid misaligned reference CI failures.

‎src/Razor/src/Microsoft.VisualStudio.LegacyEditor.Razor/Microsoft.VisualStudio.LegacyEditor.Razor.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>$(DefaultNetFxTargetFramework)</TargetFramework>
4+
<TargetFramework>$(NetFxVS)</TargetFramework>
55
<EnableApiCheck>false</EnableApiCheck>
66
<IsShippingPackage>false</IsShippingPackage>
77
<ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>

‎src/Razor/src/Microsoft.VisualStudio.RazorExtension.Dependencies/Microsoft.VisualStudio.RazorExtension.Dependencies.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
extra dependencies + codebases that may not be present in public VS installs.
99
-->
1010

11-
<TargetFramework>$(DefaultNetFxTargetFramework)</TargetFramework>
11+
<TargetFramework>$(NetFxVS)</TargetFramework>
1212

1313
<VSSDKTargetPlatformRegRootSuffix>RoslynDev</VSSDKTargetPlatformRegRootSuffix>
1414

@@ -43,7 +43,7 @@
4343
<PackageReference Include="Microsoft.VisualStudio.Shell.15.0" />
4444
<!-- Manually upgrade to address CG alert. When the VS packages
4545
pull in the right version, this can be removed. -->
46-
<PackageReference Include="Microsoft.IO.Redist" Condition="'$(TargetFramework)' == '$(DefaultNetFxTargetFramework)'" />
46+
<PackageReference Include="Microsoft.IO.Redist" Condition="'$(TargetFramework)' == '$(NetFxVS)'" />
4747
</ItemGroup>
4848

4949
<!-- Reference the LSP protocol dlls so that we can include them in the code base and output them with the VSIX. -->

0 commit comments

Comments
 (0)