Skip to content

Commit ebc32a9

Browse files
Simplify directory layout and upgrade vulnerable dependency in codeconv
1 parent 99d7035 commit ebc32a9

19 files changed

+10
-75
lines changed
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131

3232
<ItemGroup>
3333
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
34+
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.8.43" />
3435
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0" />
3536
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.14.0" />
3637
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0" />
@@ -42,6 +43,6 @@
4243
</ItemGroup>
4344

4445
<ItemGroup>
45-
<ProjectReference Include="..\..\CodeConverter\CodeConverter.csproj" />
46+
<ProjectReference Include="..\CodeConverter\CodeConverter.csproj" />
4647
</ItemGroup>
4748
</Project>
File renamed without changes.
File renamed without changes.
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,7 @@ private async Task<int> ExecuteAsync()
7777
// Ideally we'd be able to use MSBuildLocator.QueryVisualStudioInstances(DiscoveryType.VisualStudioSetup) from .NET core, but it will never be supported: https://github.com/microsoft/MSBuildLocator/issues/61
7878
// Instead, if MSBuild 16.0+ is available, start a .NET framework process and let it run with that
7979
if (_runningInNetCore && !CoreOnlyProjects) {
80-
if (await GetLatestMsBuildExePathAsync() is { } latestMsBuildExePath) {
81-
return await RunNetFrameworkExeAsync(latestMsBuildExePath);
82-
} else {
83-
Console.WriteLine($"Using dot net SDK MSBuild which only works for dot net core projects.");
84-
}
80+
await Console.Error.WriteLineAsync($"Net Framework projects detected. This is not supported after codeconv 9.2.7. Run an older version from github.com/icsharpcode/CodeConverter");
8581
}
8682

8783
try {
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)