Skip to content

Commit 6eb8d0d

Browse files
committed
Get tests running and almost all passing
1 parent aaaf1e5 commit 6eb8d0d

File tree

4 files changed

+15
-2
lines changed

4 files changed

+15
-2
lines changed
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="Validation" publicKeyToken="2fc06f0d701809a7" culture="neutral" />
7+
<bindingRedirect oldVersion="2.0.0.0" newVersion="2.3.0.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

src/NerdBank.GitVersioning.Tests/BuildIntegrationTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -888,7 +888,7 @@ private async Task<BuildResults> BuildAsync(string target = Targets.GetBuildVers
888888

889889
private void LoadTargetsIntoProjectCollection()
890890
{
891-
const string prefix = "Nerdbank.GitVersioning.Tests.Targets.";
891+
string prefix = $"{ThisAssembly.RootNamespace}.Targets.";
892892

893893
var streamNames = from name in Assembly.GetExecutingAssembly().GetManifestResourceNames()
894894
where name.StartsWith(prefix, StringComparison.Ordinal)

src/NerdBank.GitVersioning.Tests/NerdBank.GitVersioning.Tests.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<Link>Targets\%(FileName)%(Extension)</Link>
99
</EmbeddedResource>
1010
<EmbeddedResource Include="Keys\*.snk" />
11+
<EmbeddedResource Include="Keys\*.pfx" />
1112
<EmbeddedResource Include="test.prj" />
1213
<EmbeddedResource Include="repos\submodules.7z" />
1314
</ItemGroup>
@@ -23,5 +24,6 @@
2324
<PackageReference Include="xunit" Version="2.1.0" />
2425
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="1.1.1" />
2526
<PackageReference Include="Nerdbank.GitVersioning.LKG" Version="1.5.108-g37118a0bd6" />
27+
<PackageReference Include="xunit.runner.visualstudio" Version="2.1.0" />
2628
</ItemGroup>
2729
</Project>

src/NerdBank.GitVersioning.Tests/TestUtilities.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ internal static void ExtractEmbeddedResource(string resourcePath, string extract
4747
Requires.NotNullOrEmpty(resourcePath, nameof(resourcePath));
4848
Requires.NotNullOrEmpty(extractedFilePath, nameof(extractedFilePath));
4949

50-
using (var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream($"Nerdbank.GitVersioning.Tests.{resourcePath.Replace('\\', '.')}"))
50+
using (var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream($"{ThisAssembly.RootNamespace}.{resourcePath.Replace('\\', '.')}"))
5151
{
5252
Requires.Argument(stream != null, nameof(resourcePath), "Resource not found.");
5353
using (var extractedFile = File.OpenWrite(extractedFilePath))

0 commit comments

Comments
 (0)