Skip to content

Commit 5bfa8f0

Browse files
author
Zubin Ramlakhan
committed
fix usings + recharacterize cs => vb tests too.
1 parent 4200ed3 commit 5bfa8f0

185 files changed

Lines changed: 9696 additions & 15 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CodeConverter/Shared/PathConverter.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
using System;
2-
using System.IO;
1+
using System.IO;
32

43
namespace ICSharpCode.CodeConverter.Shared
54
{
6-
using System.Text.RegularExpressions;
7-
85
internal static class PathConverter
96
{
107
public static string TogglePathExtension(string filePath)

‎CodeConverter/Shared/SolutionConverter.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@
44
using System.Linq;
55
using System.Text.RegularExpressions;
66
using System.Threading;
7+
using ICSharpCode.CodeConverter.CSharp;
78
using ICSharpCode.CodeConverter.Util;
89
using Microsoft.CodeAnalysis;
910

1011
namespace ICSharpCode.CodeConverter.Shared
1112
{
12-
using ICSharpCode.CodeConverter.CSharp;
13-
1413
public class SolutionConverter
1514
{
1615
private readonly string _solutionFilePath;

‎Tests/CSharp/MultiFileSolutionAndProjectTests.cs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
using System.Threading.Tasks;
22
using ICSharpCode.CodeConverter.Tests.TestRunners;
3-
using ICSharpCode.CodeConverter.CSharp;
43
using Xunit;
5-
using static ICSharpCode.CodeConverter.CommandLine.CodeConvProgram;
64

75
namespace ICSharpCode.CodeConverter.Tests.CSharp
86
{
@@ -19,15 +17,16 @@ public MultiFileSolutionAndProjectTests(MultiFileTestFixture multiFileTestFixtur
1917
_multiFileTestFixture = multiFileTestFixture;
2018
}
2119

22-
//[Fact(Skip = "Doesn't work on Github actions agent")]
23-
[Fact]
20+
//[Fact] /* enable for executing locally */
21+
[Fact(Skip = "Doesn't work on Github actions agent")] /* disable for executing locally */
2422
public async Task ConvertWholeSolutionAsync()
2523
{
2624

2725
await _multiFileTestFixture.ConvertProjectsWhereAsync(p => true, Language.CS);
2826
}
2927

30-
[Fact]
28+
//[Fact] /* enable for executing locally */
29+
[Fact(Skip = "Doesn't work on Github actions agent")] /* disable for executing locally */
3130
public async Task ConvertVbLibraryOnlyAsync()
3231
{
3332
await _multiFileTestFixture.ConvertProjectsWhereAsync(p => p.Name == "VbLibrary", Language.CS);

‎Tests/TestData/MultiFileCharacterization/CSToVBResults/ConvertCSharpConsoleAppOnly/CSharpNetStandardLib/CSharpNetStandardLib.csproj‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
</PropertyGroup>
6+
7+
</Project>

‎Tests/TestData/MultiFileCharacterization/CSToVBResults/ConvertCSharpConsoleAppOnly/CSharpNetStandardLib/Class1.cs‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
using System;
2+
3+
namespace CSharpNetStandardLib
4+
{
5+
public class Class1
6+
{
7+
public void MethodOnlyDifferingInTypeParameterCount()
8+
{
9+
}
10+
public void MethodOnlyDifferingInTypeParameterCount<T>()
11+
{
12+
}
13+
public void MethodOnlyDifferingInTypeParameterCount<T1, T2>()
14+
{
15+
}
16+
}
17+
}

‎Tests/TestData/MultiFileCharacterization/CSToVBResults/ConvertCSharpConsoleAppOnly/CharacterizationTestSolution.sln‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "ConsoleApp4", "ConsoleApp4\
2222
EndProject
2323
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpNetStandardLib", "CSharpNetStandardLib\CSharpNetStandardLib.csproj", "{4DE39D59-19C6-4E1E-910C-5EA8BA55348B}"
2424
EndProject
25+
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Prefix.VbLibrary", "Prefix.VbLibrary\Prefix.VbLibrary.vbproj", "{CFAB82CD-BA17-4F08-99E2-403FADB0C46A}"
26+
EndProject
2527
Global
2628
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2729
Debug|Any CPU = Debug|Any CPU
@@ -56,6 +58,10 @@ Global
5658
{4DE39D59-19C6-4E1E-910C-5EA8BA55348B}.Debug|Any CPU.Build.0 = Debug|Any CPU
5759
{4DE39D59-19C6-4E1E-910C-5EA8BA55348B}.Release|Any CPU.ActiveCfg = Release|Any CPU
5860
{4DE39D59-19C6-4E1E-910C-5EA8BA55348B}.Release|Any CPU.Build.0 = Release|Any CPU
61+
{CFAB82CD-BA17-4F08-99E2-403FADB0C46A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
62+
{CFAB82CD-BA17-4F08-99E2-403FADB0C46A}.Debug|Any CPU.Build.0 = Debug|Any CPU
63+
{CFAB82CD-BA17-4F08-99E2-403FADB0C46A}.Release|Any CPU.ActiveCfg = Release|Any CPU
64+
{CFAB82CD-BA17-4F08-99E2-403FADB0C46A}.Release|Any CPU.Build.0 = Release|Any CPU
5965
EndGlobalSection
6066
GlobalSection(SolutionProperties) = preSolution
6167
HideSolutionNode = FALSE

‎Tests/TestData/MultiFileCharacterization/CSToVBResults/ConvertCSharpConsoleAppOnly/ConsoleApp1/AVbClass.vb‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Imports System.Runtime.InteropServices
2+
Imports System
3+
4+
Module Module1
5+
Public Sub Main()
6+
End Sub
7+
End Module

‎Tests/TestData/MultiFileCharacterization/CSToVBResults/ConvertCSharpConsoleAppOnly/ConsoleApp1/App.config‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<configuration>
3+
<startup>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
5+
</startup>
6+
</configuration>

‎Tests/TestData/MultiFileCharacterization/CSToVBResults/ConvertCSharpConsoleAppOnly/ConsoleApp1/My Project/Application.Designer.cs‎

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Tests/TestData/MultiFileCharacterization/CSToVBResults/ConvertCSharpConsoleAppOnly/ConsoleApp1/My Project/Application.Designer.vb‎

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)