Skip to content

Commit b102290

Browse files
author
Andrew Hall
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‎

Lines changed: 10 additions & 15 deletions
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 2 additions & 2 deletions
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

0 commit comments

Comments
 (0)