Skip to content

Commit f1036ff

Browse files
TianMengLuckyTianMengLucky
committed
Revert "?"
This reverts commit 65eb77f.
1 parent 8734d76 commit f1036ff

15 files changed

Lines changed: 66 additions & 30 deletions

File tree

‎build/Directory.Build.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
44

55
<PropertyGroup>
6+
<TargetFrameworks></TargetFrameworks>
67
<TargetFramework>net9.0</TargetFramework>
78
<ImplicitUsings>enable</ImplicitUsings>
89

‎build/extract-corjit-vtable/extract-corjit-vtable.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="ClangSharp" Version="18.1.0.3" />
12+
<PackageReference Include="ClangSharp" Version="18.1.0.1" />
1313
</ItemGroup>
1414

1515
</Project>

‎docfx/docfx.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"enumSortOrder": "declaringOrder",
3333
"noRestore": true,
3434
"properties": {
35-
"TargetFramework": "net9.0"
35+
"TargetFramework": "net8.0"
3636
}
3737
}
3838
],

‎global.json‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
{
2-
"sdk": {
3-
"version": "9.0.0",
4-
"rollForward": "latestMajor",
5-
"allowPrerelease": true
6-
},
7-
"msbuild-sdks": {
8-
"Microsoft.Build.NoTargets": "3.7.56"
9-
}
10-
}
1+
{
2+
"sdk": {
3+
"allowPrerelease": true,
4+
"rollForward": "latestPatch",
5+
"version": "9.0.200"
6+
},
7+
"msbuild-sdks": {
8+
"Microsoft.Build.NoTargets": "3.7.56",
9+
"Microsoft.NET.Sdk.IL": "8.0.0"
10+
}
11+
}

‎src/MonoMod.Backports.Tasks/MonoMod.Backports.Tasks.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.13.9" />
21+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MSBuildRequiredVersion)" />
2222
<!--<PackageReference Include="System.Collections.Immutable" Version="6.0.0" />-->
2323
</ItemGroup>
2424

‎src/MonoMod.FrameworkTests/MonoMod.FrameworkTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<IsPackable>false</IsPackable>
6-
<TargetFrameworks>$(TargetFrameworks);</TargetFrameworks>
6+
<TargetFrameworks>$(TargetFrameworks);netcoreapp3.1</TargetFrameworks>
77

88
<NoWarn>$(NoWarn);CA1303</NoWarn>
99
</PropertyGroup>

‎src/MonoMod.SourceGen.Internal/MonoMod.SourceGen.Internal.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" PrivateAssets="all" />
22-
<PackageReference Include="PolySharp" Version="1.15.0">
21+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(RoslynVersion)" PrivateAssets="all" />
22+
<PackageReference Include="PolySharp" Version="1.14.1">
2323
<PrivateAssets>all</PrivateAssets>
2424
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2525
</PackageReference>

‎src/MonoMod.UnitTest/MonoMod.UnitTest.csproj‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
<ProjectGuid>{0291CFD9-75F9-4978-BE83-58DE5194BECA}</ProjectGuid>
66

77
<AssemblyName>MonoMod.UnitTest</AssemblyName>
8+
<PackageId></PackageId>
9+
<Description></Description>
810
<PackageTags>$(PackageTags)</PackageTags>
911

1012
<NoWarn>$(NoWarn);CA1852</NoWarn>
1113

1214
<!-- Put .NET 6.0 as the first framework so that OmniSharp uses it for VS Code Intelisense -->
13-
<TargetFrameworks>net6.0;net8.0;net9.0;</TargetFrameworks>
15+
<TargetFrameworks>net6.0;net5.0;net7.0;net8.0;net9.0;net462;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
1416
<SignAssembly>skip</SignAssembly>
1517
<Nullable>annotations</Nullable>
1618

@@ -20,6 +22,8 @@
2022

2123
<XunitVersion Condition="'$(XunitVersion)' == ''">2.4.2</XunitVersion>
2224
<XunitVsRunnerVersion>$(XunitVersion)</XunitVsRunnerVersion>
25+
<!-- 2.4.5 drops support for net452 -->
26+
<XunitVsRunnerVersion Condition="'$(TargetFramework)' == 'net462'">[2.*,2.4.3]</XunitVsRunnerVersion>
2327
</PropertyGroup>
2428

2529
<!-- Dependencies -->
@@ -50,6 +54,11 @@
5054

5155
<!-- xUnit -->
5256
<ItemGroup>
57+
<!--<PackageReference Include="NETStandard.Library" Version="2.0.0">
58+
<Version Condition="'$(TargetFramework)' == 'netcoreapp1.0'">1.6.1</Version>
59+
<Version Condition="'$(TargetFramework)' == 'netcoreapp2.0'">2.0.0</Version>
60+
<Version Condition="'$(TargetFramework)' == 'netcoreapp2.1'">2.0.3</Version>
61+
</PackageReference>-->
5362
<PackageReference Include="xunit" Version="$(XunitVersion)" />
5463
<PackageReference Include="xunit.analyzers" Version="1.*" />
5564
<PackageReference Include="xunit.core" Version="$(XunitVersion)" />

‎tools/Common.CS.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@
3737
<NoWarn>$(NoWarn);CA2020</NoWarn> <!-- Starting with .NET 7, conversions with IntPtr don't throw in an unchecked context -->
3838
<NoWarn>$(NoWarn);CA1303</NoWarn> <!-- Use resource tables for strings passed to Console.WriteLine -->
3939

40-
<NewCecilVersion>0.11.6</NewCecilVersion>
40+
<NewCecilVersion>0.11.5</NewCecilVersion>
41+
<OldCecilVersion>0.10.4</OldCecilVersion>
4142

4243
<RoslynVersion>4.12.0</RoslynVersion>
4344
<MSBuildRequiredVersion>17.12.6</MSBuildRequiredVersion>

‎tools/Common.CS.targets‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,30 @@
125125
<PackageReference Include="System.Reflection.Emit.ILGeneration" Version="4.7.0" />
126126
</ItemGroup>
127127
</When>
128+
129+
<When Condition="'$(TargetFramework)' != 'net35'">
130+
<!-- .NET Framework 4.0+ -->
131+
<PropertyGroup>
132+
<DefineConstants>NETFRAMEWORK4;$(DefineConstants)</DefineConstants>
133+
<DefineConstants>CECIL0_11;$(DefineConstants)</DefineConstants>
134+
<CecilVersion Condition="'$(CecilVersion)' == ''">$(NewCecilVersion)</CecilVersion>
135+
</PropertyGroup>
136+
<ItemGroup>
137+
<Reference Include="System" />
138+
</ItemGroup>
139+
</When>
140+
141+
<When Condition="'$(TargetFramework)' == 'net35'">
142+
<!-- .NET Framework 3.5 -->
143+
<PropertyGroup>
144+
<DefineConstants>NETFRAMEWORK3;$(DefineConstants)</DefineConstants>
145+
<DefineConstants>CECIL0_10;$(DefineConstants)</DefineConstants>
146+
<CecilVersion Condition="'$(CecilVersion)' == ''">$(OldCecilVersion)</CecilVersion>
147+
</PropertyGroup>
148+
<ItemGroup>
149+
<Reference Include="System" />
150+
</ItemGroup>
151+
</When>
128152
</Choose>
129153

130154
<ItemGroup>

0 commit comments

Comments
 (0)