Skip to content

Commit c9e0751

Browse files
GrahamTheCoderGrahamTheCoder
committed
Try to replace all "best effort" references with these prepackages ones
1 parent 63c7a2a commit c9e0751

5 files changed

Lines changed: 19 additions & 52 deletions

File tree

‎CodeConverter/Common/DefaultReferences.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
using System.Linq;
66
using System.Reflection;
77
using System.Threading.Tasks;
8+
using Basic.Reference.Assemblies;
89
using Microsoft.CodeAnalysis;
10+
using static Basic.Reference.Assemblies.AspNet100;
911

1012
namespace ICSharpCode.CodeConverter.Common;
1113

@@ -42,10 +44,7 @@ public static class DefaultReferences
4244
private static readonly Dictionary<string, (string Location, string[] ReferenceNames)> _assemblyInfoCache = new();
4345

4446
public static IReadOnlyCollection<PortableExecutableReference> NetStandard2 { get; } =
45-
With(Array.Empty<Assembly>()).ToArray();
46-
47-
public static IReadOnlyCollection<PortableExecutableReference> With(params Assembly[] assemblies) =>
48-
GetRefs(GetPathsForAllReferences(DefaultAssemblies.Concat(assemblies))).ToArray();
47+
AspNet100.References.All;
4948

5049
private static IEnumerable<PortableExecutableReference> GetRefs(IEnumerable<string> assemblyLocations) =>
5150
assemblyLocations.Select(a => MetadataReference.CreateFromFile(a));

‎Func/Func.csproj‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,19 @@
2222
<None Remove="TestingWithBruno\**" />
2323
</ItemGroup>
2424

25-
<ItemGroup>
26-
<Compile Include="..\CodeConverter\Common\DefaultReferences.cs" Link="DefaultReferences.cs" />
27-
</ItemGroup>
28-
2925
<ItemGroup>
3026
<ProjectReference Include="..\CodeConverter\CodeConverter.csproj" />
3127
</ItemGroup>
3228

3329
<ItemGroup>
30+
<PackageReference Include="Basic.Reference.Assemblies.AspNet100" Version="1.8.4" />
31+
3432
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="2.51.0" />
3533
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.3.0" />
3634
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="2.1.0" />
3735
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.7" />
3836
<PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.22.0" />
3937
<PackageReference Include="Microsoft.Azure.Functions.Worker.ApplicationInsights" Version="1.4.0" />
40-
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.4" />
4138
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
4239

4340
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.2" />
@@ -46,17 +43,6 @@
4643
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.14.0" />
4744
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.14.0" />
4845
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.14.0" />
49-
<PackageReference Include="System.Text.Json" Version="10.0.2" />
50-
</ItemGroup>
51-
<ItemGroup>
52-
<!-- So we can reference commonly referenced assemblies in created compilations-->
53-
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
54-
<PackageReference Include="System.Formats.Asn1" Version="10.0.2" />
55-
<PackageReference Include="System.Memory" Version="4.6.3" />
56-
<PackageReference Include="System.Net.Http" Version="4.3.4" />
57-
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
58-
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
59-
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
6046
</ItemGroup>
6147
<ItemGroup>
6248
<None Update="host.json">

‎Func/WebConverter.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.Threading;
33
using System.Threading.Tasks;
4+
using Basic.Reference.Assemblies;
45
using ICSharpCode.CodeConverter.Common;
56
using Microsoft.CodeAnalysis;
67

@@ -24,7 +25,7 @@ public static async Task<ConvertResponse> ConvertAsync(ConvertRequest todo, Canc
2425
}
2526

2627
var codeWithOptions = new CodeWithOptions(todo.code)
27-
.WithTypeReferences(DefaultReferences.With(typeof(Microsoft.Data.SqlClient.SqlCommand).Assembly))
28+
.WithTypeReferences(AspNet100.References.All)
2829
.SetFromLanguage(fromLanguage)
2930
.SetToLanguage(toLanguage);
3031

‎Vsix/CodeConversion.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
using Microsoft.VisualStudio.Shell;
1515
using Microsoft.VisualStudio.Text;
1616
using Microsoft.VisualStudio.Threading;
17+
using static Basic.Reference.Assemblies.NetStandard20;
1718
using Task = System.Threading.Tasks.Task;
1819

1920
namespace ICSharpCode.CodeConverter.VsExtension;
@@ -377,7 +378,7 @@ await CreateTextConversionOptionsAsync(documentPath),
377378

378379
private async Task<TextConversionOptions> CreateTextConversionOptionsAsync(string documentPath = null)
379380
{
380-
return new TextConversionOptions(DefaultReferences.NetStandard2, documentPath) {
381+
return new TextConversionOptions(References.All, documentPath) {
381382
AbandonOptionalTasksAfter = await GetAbandonOptionalTasksAfterAsync()
382383
};
383384
}

‎Vsix/Vsix.csproj‎

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,13 @@
5050
<WarningLevel>4</WarningLevel>
5151
</PropertyGroup>
5252
<ItemGroup>
53-
<!-- Build against VS 16.10 -->
53+
<PackageReference Include="Basic.Reference.Assemblies.NetStandard20">
54+
<Version>1.8.4</Version>
55+
</PackageReference>
5456
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces">
5557
<Version>10.0.2</Version>
5658
</PackageReference>
59+
<!-- Build against VS 16.10 -->
5760
<PackageReference Include="Microsoft.VisualStudio.LanguageServices" Version="4.14.0" />
5861
<PackageReference Include="Microsoft.VisualStudio.SDK" Version="16.10.31321.278" ExcludeAssets="runtime">
5962
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -63,19 +66,6 @@
6366
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6467
<PrivateAssets>all</PrivateAssets>
6568
</PackageReference>
66-
<PackageReference Include="System.Data.Common">
67-
<Version>4.3.0</Version>
68-
</PackageReference>
69-
<PackageReference Include="System.Data.DataSetExtensions">
70-
<Version>4.5.0</Version>
71-
</PackageReference>
72-
<PackageReference Include="System.Data.SqlClient">
73-
<Version>4.8.6</Version>
74-
</PackageReference>
75-
<PackageReference Include="System.Net.Http" Version="4.3.4" />
76-
<PackageReference Include="System.Text.Json">
77-
<Version>10.0.0</Version>
78-
</PackageReference>
7969
</ItemGroup>
8070
<ItemGroup>
8171
<VSCTCompile Include="REConverterPackage.vsct">
@@ -100,20 +90,6 @@
10090
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
10191
</ItemGroup>
10292
<ItemGroup>
103-
<Reference Include="Microsoft.CSharp" />
104-
<Reference Include="PresentationCore" />
105-
<Reference Include="PresentationFramework" />
106-
<Reference Include="System" />
107-
<Reference Include="System.Design" />
108-
<Reference Include="System.Web" />
109-
<Reference Include="System.Windows.Forms" />
110-
<Reference Include="System.Xml" />
111-
<Reference Include="System.Xml.Linq" />
112-
</ItemGroup>
113-
<ItemGroup>
114-
<Compile Include="..\CodeConverter\Common\DefaultReferences.cs">
115-
<Link>DefaultReferences.cs</Link>
116-
</Compile>
11793
<Compile Include="AppDomainExtensions.cs" />
11894
<Compile Include="OleMenuCommandWithBlockingStatus.cs" />
11995
<Compile Include="CodeConversion.cs" />
@@ -146,7 +122,11 @@
146122
<Name>CodeConverter</Name>
147123
</ProjectReference>
148124
</ItemGroup>
149-
<ItemGroup />
125+
<ItemGroup>
126+
<Reference Include="System.Design" />
127+
<Reference Include="PresentationCore" />
128+
<Reference Include="PresentationFramework" />
129+
</ItemGroup>
150130
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
151131
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
152132
<PropertyGroup>
@@ -162,4 +142,4 @@
162142
<Target Name="AfterBuild">
163143
</Target>
164144
-->
165-
</Project>
145+
</Project>

0 commit comments

Comments
 (0)