Skip to content

Commit dd42f8b

Browse files
committed
Normalize bin folder
1 parent 1f3750e commit dd42f8b

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

Packages/com.unity.ide.visualstudio.tests/Tests/Editor/AssemblyNameProviderTests.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ public void SetUp()
3030
m_AssemblyNameProvider.ResetProjectGenerationFlag();
3131
}
3232

33-
[TestCase(@"Temp\Bin\Debug\", "AssemblyName", "AssemblyName")]
34-
[TestCase(@"Temp\Bin\Debug\", "My.Player.AssemblyName", "My.Player.AssemblyName")]
35-
[TestCase(@"Temp\Bin\Debug\", "AssemblyName.Player", "AssemblyName.Player")]
36-
[TestCase(@"Temp\Bin\Debug\Player\", "AssemblyName", "AssemblyName.Player")]
37-
[TestCase(@"Temp\Bin\Debug\Player\", "AssemblyName.Player", "AssemblyName.Player.Player")]
33+
[TestCase(@"Temp\bin\Debug\", "AssemblyName", "AssemblyName")]
34+
[TestCase(@"Temp\bin\Debug\", "My.Player.AssemblyName", "My.Player.AssemblyName")]
35+
[TestCase(@"Temp\bin\Debug\", "AssemblyName.Player", "AssemblyName.Player")]
36+
[TestCase(@"Temp\bin\Debug\Player\", "AssemblyName", "AssemblyName.Player")]
37+
[TestCase(@"Temp\bin\Debug\Player\", "AssemblyName.Player", "AssemblyName.Player.Player")]
3838
public void GetOutputPath_ReturnsPlayerAndeditorOutputPath(string assemblyOutputPath, string assemblyName, string expectedAssemblyName)
3939
{
4040
Assert.AreEqual(expectedAssemblyName, m_AssemblyNameProvider.GetAssemblyName(assemblyOutputPath, assemblyName));
@@ -49,7 +49,7 @@ public void AllEditorAssemblies_AreCollected()
4949

5050
foreach (Assembly editorAssembly in editorAssemblies)
5151
{
52-
Assert.IsTrue(collectedAssemblies.Any(assembly => assembly.name == editorAssembly.name && assembly.outputPath == @"Temp\Bin\Debug\"), $"{editorAssembly.name}: was not found in collection.");
52+
Assert.IsTrue(collectedAssemblies.Any(assembly => assembly.name == editorAssembly.name && assembly.outputPath == @"Temp\bin\Debug\"), $"{editorAssembly.name}: was not found in collection.");
5353
}
5454
}
5555

@@ -91,7 +91,7 @@ public void PlayerAssemblies_AreNotCollected_BeforeToggling()
9191

9292
foreach (Assembly playerAssembly in playerAssemblies)
9393
{
94-
Assert.IsFalse(collectedAssemblies.Any(assembly => assembly.name == playerAssembly.name && assembly.outputPath == @"Temp\Bin\Debug\Player\"), $"{playerAssembly.name}: was found in collection.");
94+
Assert.IsFalse(collectedAssemblies.Any(assembly => assembly.name == playerAssembly.name && assembly.outputPath == @"Temp\bin\Debug\Player\"), $"{playerAssembly.name}: was found in collection.");
9595
}
9696
}
9797

@@ -106,7 +106,7 @@ public void AllPlayerAssemblies_AreCollected_AfterToggling()
106106

107107
foreach (Assembly playerAssembly in playerAssemblies)
108108
{
109-
Assert.IsTrue(collectedAssemblies.Any(assembly => assembly.name == playerAssembly.name && assembly.outputPath == @"Temp\Bin\Debug\Player\"), $"{playerAssembly.name}: was not found in collection.");
109+
Assert.IsTrue(collectedAssemblies.Any(assembly => assembly.name == playerAssembly.name && assembly.outputPath == @"Temp\bin\Debug\Player\"), $"{playerAssembly.name}: was not found in collection.");
110110
}
111111
}
112112

Packages/com.unity.ide.visualstudio/Editor/ProjectGeneration/AssemblyNameProvider.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ public string GetAssemblyNameFromScriptPath(string path)
6363

6464
public IEnumerable<Assembly> GetAssemblies(Func<string, bool> shouldFileBePartOfSolution)
6565
{
66-
IEnumerable<Assembly> assemblies = GetAssembliesByType(AssembliesType.Editor, shouldFileBePartOfSolution, @"Temp\Bin\Debug\");
66+
IEnumerable<Assembly> assemblies = GetAssembliesByType(AssembliesType.Editor, shouldFileBePartOfSolution, @"Temp\bin\Debug\");
6767

6868
if (!ProjectGenerationFlag.HasFlag(ProjectGenerationFlag.PlayerAssemblies))
6969
{
7070
return assemblies;
7171
}
72-
var playerAssemblies = GetAssembliesByType(AssembliesType.Player, shouldFileBePartOfSolution, @"Temp\Bin\Debug\Player\");
72+
var playerAssemblies = GetAssembliesByType(AssembliesType.Player, shouldFileBePartOfSolution, @"Temp\bin\Debug\Player\");
7373
return assemblies.Concat(playerAssemblies);
7474
}
7575

@@ -98,7 +98,8 @@ private static IEnumerable<Assembly> GetAssembliesByType(AssembliesType type, Fu
9898

9999
public string GetCompileOutputPath(string assemblyName)
100100
{
101-
return assemblyName.EndsWith(".Player", StringComparison.Ordinal) ? @"Temp\Bin\Debug\Player\" : @"Temp\Bin\Debug\";
101+
// We need to keep this one for API surface check (AssemblyNameProvider is public), but not used anymore
102+
throw new NotImplementedException();
102103
}
103104

104105
public IEnumerable<string> GetAllAssetPaths()

0 commit comments

Comments
 (0)