Skip to content

Commit

Permalink
Merge pull request #286 from AvaloniaUI/rename-assemblies
Browse files Browse the repository at this point in the history
Rename assemblies
  • Loading branch information
maxkatz6 authored Jan 17, 2023
2 parents c9cd679 + 2139e59 commit d2e374f
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions AvaloniaVS.sln
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{3CF4E8CC
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompletionEngineTests", "tests\CompletionEngineTests\CompletionEngineTests.csproj", "{70475448-B721-48BD-A96D-56C8A0B88BA0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ass1", "tests\Ass1\Ass1.csproj", "{26CB0499-10FE-4CC1-9F20-4738BF527494}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestAssembly1", "tests\Ass1\TestAssembly1.csproj", "{26CB0499-10FE-4CC1-9F20-4738BF527494}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ass2", "tests\Ass2\Ass2.csproj", "{0D792D9B-66F7-46DB-AC87-AA3068151E6C}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestAssembly2", "tests\Ass2\TestAssembly2.csproj", "{0D792D9B-66F7-46DB-AC87-AA3068151E6C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions tests/CompletionEngineTests/CompletionEngineTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
<ItemGroup>
<ProjectReference Include="..\..\CompletionEngine\Avalonia.Ide.CompletionEngine.DnlibMetadataProvider\Avalonia.Ide.CompletionEngine.DnlibMetadataProvider.csproj" />
<ProjectReference Include="..\..\CompletionEngine\Avalonia.Ide.CompletionEngine\Avalonia.Ide.CompletionEngine.csproj" />
<ProjectReference Include="..\Ass1\Ass1.csproj" Aliases="A1"/>
<ProjectReference Include="..\Ass2\Ass2.csproj" Aliases="A2"/>
<ProjectReference Include="..\Ass1\TestAssembly1.csproj" Aliases="A1" />
<ProjectReference Include="..\Ass2\TestAssembly2.csproj" Aliases="A2" />
</ItemGroup>

</Project>
10 changes: 5 additions & 5 deletions tests/CompletionEngineTests/Metadata/MetadataConverterTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ public static IEnumerable<object[]> GetCasese()
})),
};

// Assembly Ass1 with InternalsVisibleTo
// TestAssembly1 with InternalsVisibleTo
yield return new object[]
{
new TestScenario("InternalsVisibleTo Internal Attached Behavior",
Expand Down Expand Up @@ -145,11 +145,11 @@ public static IEnumerable<object[]> GetCasese()
})),
};

// Assembly Ass2 without InternalsVisibleTo
// TestAssembly2 without InternalsVisibleTo
yield return new object[]
{
new TestScenario("Not InternalsVisibleTo Internal Attached Behavior",
Type.GetType("CompletionEngineTests.Models.InternalAttachedBehavior, Ass2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"),
Type.GetType("CompletionEngineTests.Models.InternalAttachedBehavior, TestAssembly2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"),
new Action<Type,MetadataType>(static (clrType,mdType) =>
{
Assert.Null(mdType);
Expand All @@ -158,7 +158,7 @@ public static IEnumerable<object[]> GetCasese()
yield return new object[]
{
new TestScenario("Not InternalsVisibleTo Internal Class",
Type.GetType("CompletionEngineTests.Models.InternalAttachedBehavior, Ass2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"),
Type.GetType("CompletionEngineTests.Models.InternalAttachedBehavior, TestAssembly2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"),
new Action<Type,MetadataType>(static (clrType,mdType) =>
{
Assert.Null(mdType);
Expand All @@ -167,7 +167,7 @@ public static IEnumerable<object[]> GetCasese()
yield return new object[]
{
new TestScenario("InternalsVisibleTo Public Class with internal properties",
Type.GetType("CompletionEngineTests.Models.PublicWithInternalPropertiesClass, Ass2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"),
Type.GetType("CompletionEngineTests.Models.PublicWithInternalPropertiesClass, TestAssembly2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"),
new Action<Type,MetadataType>(static (clrType,mdType) =>
{
Assert.Equal(clrType.AssemblyQualifiedName, mdType.AssemblyQualifiedName);
Expand Down

0 comments on commit d2e374f

Please sign in to comment.