Skip to content

Commit a8d03c3

Browse files
xremronimizy
xrem
authored and
ronimizy
committed
draft
1 parent 5448b59 commit a8d03c3

File tree

9 files changed

+69
-54
lines changed

9 files changed

+69
-54
lines changed

‎Directory.Packages.props

+23-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,25 @@
11
<Project>
2-
<PropertyGroup>
3-
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4-
</PropertyGroup>
5-
<ItemGroup>
6-
</ItemGroup>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<PackageVersion Include="Ben.Demystifier" Version="0.4.1" />
7+
<PackageVersion Include="coverlet.collector" Version="3.2.0" />
8+
<PackageVersion Include="FluentAssertions" Version="6.11.0" />
9+
<PackageVersion Include="Lokad.ILPack" Version="0.2.0" />
10+
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
11+
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.5.0" />
12+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" Version="1.1.1" />
13+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.5.0" />
14+
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.5.0" />
15+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
16+
<PackageVersion Include="PolySharp" Version="1.13.1" />
17+
<PackageVersion Include="Sigil" Version="5.0.0" />
18+
<PackageVersion Include="System.Reflection.Emit" Version="4.7.0" />
19+
<PackageVersion Include="System.Reflection.Emit.ILGeneration" Version="4.7.0" />
20+
<PackageVersion Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
21+
<PackageVersion Include="xunit" Version="2.4.2" />
22+
<PackageVersion Include="Xunit.DependencyInjection.Demystifier" Version="8.0.1" />
23+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
24+
</ItemGroup>
725
</Project>

‎SourceKit.Sample/SourceKit.Sample.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="SourceKit.Analyzers.MustBePartial" Version="1.0.0" />
10+
<PackageReference Include="SourceKit.Analyzers.MustBePartial" />
1111
</ItemGroup>
1212

1313
</Project>

‎SourceKit.Tests/Analyzers/MustBePartialTests.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class MustBePartialTests
1212
[Fact]
1313
public async Task A()
1414
{
15-
var subject = await File.ReadAllTextAsync("MustBePartial/NotPartialDerivative.cs");
15+
var subject = File.ReadAllText("MustBePartial/NotPartialDerivative.cs");
1616

1717
var test = new CSharpAnalyzerTest<DerivativesMustBePartialAnalyzer, XUnitVerifier>
1818
{
@@ -27,11 +27,11 @@ public async Task A()
2727
await test.RunAsync();
2828
}
2929

30-
private static async Task<(string name, string content)> LoadFileAsync(string path)
30+
private static Task<(string name, string content)> LoadFileAsync(string path)
3131
{
3232
var name = Path.ChangeExtension(Path.GetFileName(path), null);
33-
var content = await File.ReadAllTextAsync(path);
33+
var content = File.ReadAllText(path);
3434

35-
return (name, content);
35+
return Task.FromResult((name, content));
3636
}
3737
}

‎SourceKit.Tests/SourceKit.Tests.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>netstandard2.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
7+
<LangVersion>11</LangVersion>
78

89
<IsPackable>false</IsPackable>
910
</PropertyGroup>
1011

1112
<ItemGroup>
12-
<PackageReference Include="Ben.Demystifier" Version="0.4.1" />
13-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" Version="1.1.1" />
14-
<PackageReference Include="Sigil" Version="5.0.0" />
15-
<PackageReference Include="FluentAssertions" Version="6.10.0" />
16-
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.2.0" />
17-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.2.0" />
18-
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.2.0" />
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
20-
<PackageReference Include="xunit" Version="2.4.2" />
21-
<PackageReference Include="Xunit.DependencyInjection.Demystifier" Version="8.0.1" />
22-
23-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
13+
<PackageReference Include="Ben.Demystifier" />
14+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" />
15+
<PackageReference Include="Sigil" />
16+
<PackageReference Include="FluentAssertions" />
17+
<PackageReference Include="Microsoft.CodeAnalysis.Common" />
18+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
19+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" VersionOverride="4.5.0" />
20+
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" />
21+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
22+
<PackageReference Include="SourceKit.Analyzers.MustBePartial" />
23+
<PackageReference Include="xunit" />
24+
<PackageReference Include="Xunit.DependencyInjection.Demystifier" />
25+
26+
<PackageReference Include="xunit.runner.visualstudio">
2427
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2528
<PrivateAssets>all</PrivateAssets>
2629
</PackageReference>
2730

28-
<PackageReference Include="coverlet.collector" Version="3.1.2">
31+
<PackageReference Include="coverlet.collector">
2932
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3033
<PrivateAssets>all</PrivateAssets>
3134
</PackageReference>
@@ -34,18 +37,19 @@
3437

3538
<ItemGroup>
3639
<ProjectReference Include="..\SourceKit.Sample\SourceKit.Sample.csproj" />
37-
<ProjectReference Include="..\src\analyzers\SourceKit.Analyzers.MustBePartial\SourceKit.Analyzers.MustBePartial.csproj" />
3840
<ProjectReference Include="..\src\SourceKit.Reflect\SourceKit.Reflect.csproj" />
3941
</ItemGroup>
4042

4143
<ItemGroup>
4244
<Content Include="..\SourceKit.Sample\**\*.cs" Exclude="..\SourceKit.Sample\obj\**\*.*" LinkBase="SourceKit.Sample\" CopyToOutputDirectory="Always" />
4345
</ItemGroup>
4446

47+
<!--
4548
<ItemGroup>
4649
<Reference Include="assembly_1">
4750
<HintPath>a.dll</HintPath>
4851
</Reference>
4952
</ItemGroup>
53+
-->
5054

5155
</Project>

‎src/SourceKit.Reflect/Reflectors/Method/LambdaBuilder.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ private void BuildLambda(IAnonymousFunctionOperation function)
9494

9595
staticConstructorBuilder.CreateTypeInitializer();
9696

97-
var type = typeBuilder.CreateType();
97+
var type = typeBuilder.CreateTypeInfo();
9898
var delegateField = type.GetField(functionField.Name, BindingFlags.Public | BindingFlags.Static)!;
9999
var instanceField = type.GetField(instanceFieldBuilder.Name, BindingFlags.Public | BindingFlags.Static)!;
100100
var method = type.GetMethod(functionMethod.Name, BindingFlags.Public | BindingFlags.Instance)!;

‎src/SourceKit.Reflect/Reflectors/Method/MethodReflector.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ public T CreateMethod<T>(SyntaxNode syntax, Compilation compilation) where T : D
5555
methodBodyOperation.Accept(compiler);
5656
emit.CreateMethod();
5757

58-
var type = typeBuilder.CreateType();
59-
58+
var type = typeBuilder.CreateTypeInfo();
59+
6060
var method = type.GetMethod(symbol.Name, BindingFlags.Public | BindingFlags.Static)!;
61-
61+
6262
context.Save("/Users/george/Documents/C#/SourceKit/SourceKit.Tests/a.dll");
6363

6464
return (T)method.CreateDelegate(delegateType);

‎src/SourceKit.Reflect/SourceKit.Reflect.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.1</TargetFramework>
4+
<TargetFramework>netstandard2.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<LangVersion>11</LangVersion>
@@ -17,19 +17,19 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Lokad.ILPack" Version="0.2.0" />
21-
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
22-
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.2.0" PrivateAssets="all" />
23-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0" PrivateAssets="all" />
24-
<PackageReference Include="PolySharp" Version="1.12.1">
20+
<PackageReference Include="Lokad.ILPack" />
21+
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
22+
<PackageReference Include="Microsoft.CodeAnalysis.Common" PrivateAssets="all" />
23+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
24+
<PackageReference Include="PolySharp">
2525
<PrivateAssets>all</PrivateAssets>
2626
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2727
</PackageReference>
2828

29-
<PackageReference Include="Sigil" Version="5.0.0" GeneratePathProperty="true" PrivateAssets="all" />
30-
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" GeneratePathProperty="true" PrivateAssets="all" />
31-
<PackageReference Include="System.Reflection.Emit.ILGeneration" Version="4.7.0" GeneratePathProperty="true" PrivateAssets="all" />
32-
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" GeneratePathProperty="true" PrivateAssets="all" />
29+
<PackageReference Include="Sigil" GeneratePathProperty="true" PrivateAssets="all" />
30+
<PackageReference Include="System.Reflection.Emit" GeneratePathProperty="true" PrivateAssets="all" />
31+
<PackageReference Include="System.Reflection.Emit.ILGeneration" GeneratePathProperty="true" PrivateAssets="all" />
32+
<PackageReference Include="System.Reflection.Emit.Lightweight" GeneratePathProperty="true" PrivateAssets="all" />
3333
</ItemGroup>
3434

3535
<ItemGroup>
@@ -43,11 +43,4 @@
4343
<ProjectReference Include="..\SourceKit\SourceKit.csproj" />
4444
</ItemGroup>
4545

46-
<ItemGroup>
47-
<PackageVersion Update="PolySharp" Version="1.13.1">
48-
<PrivateAssets>all</PrivateAssets>
49-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
50-
</PackageVersion>
51-
</ItemGroup>
52-
5346
</Project>

‎src/SourceKit/SourceKit.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
16-
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.2.0" PrivateAssets="all" />
17-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0" PrivateAssets="all" />
15+
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
16+
<PackageReference Include="Microsoft.CodeAnalysis.Common" PrivateAssets="all" />
17+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
1818
</ItemGroup>
1919

2020
</Project>

‎src/analyzers/SourceKit.Analyzers.MustBePartial/SourceKit.Analyzers.MustBePartial.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020

2121
<ItemGroup>
2222
<ProjectReference Include="..\..\SourceKit\SourceKit.csproj" PrivateAssets="all" />
23-
<ProjectReference Include="..\SourceKit.Analyzers.MustBePartial.Annotations\SourceKit.Analyzers.MustBePartial.Annotations.csproj" />
2423
</ItemGroup>
2524

2625
<ItemGroup>
27-
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.2.0" />
28-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0" />
29-
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.2.0" />
26+
<PackageReference Include="SourceKit.Analyzers.MustBePartial" />
27+
<PackageReference Include="Microsoft.CodeAnalysis.Common" />
28+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" VersionOverride="4.5.0" />
29+
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" />
3030
</ItemGroup>
3131

3232
<ItemGroup>
@@ -38,5 +38,5 @@
3838
<None Include="$(OutputPath)\$(AssemblyName).Annotations.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
3939
<None Include="$(OutputPath)\SourceKit.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
4040
</ItemGroup>
41-
41+
4242
</Project>

0 commit comments

Comments
 (0)