mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

turn on signing test (#4460)

Browse source 
* turn on signing test

* fix the test

* test with xplat AssemblyOriginatorKeyFile

* tweak signassembly condition
This commit is contained in:
Bryan Thornbury 2016-10-20 20:15:42 -07:00 • committed by GitHub
parent ecbc45098d
commit 5301f08423
3 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigrateBuildOptionsRule.cs
View file

@ -26,13 +26,12 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Rules
private AddPropertyTransform<CommonCompilerOptions>[] KeyFileTransforms private AddPropertyTransform<CommonCompilerOptions>[] KeyFileTransforms
=> new [] => new []
{ {
new AddPropertyTransform<CommonCompilerOptions>("KeyOriginatorFile", new AddPropertyTransform<CommonCompilerOptions>("AssemblyOriginatorKeyFile",
compilerOptions => compilerOptions.KeyFile, compilerOptions => compilerOptions.KeyFile,
compilerOptions => !string.IsNullOrEmpty(compilerOptions.KeyFile)), compilerOptions => !string.IsNullOrEmpty(compilerOptions.KeyFile)),
new AddPropertyTransform<CommonCompilerOptions>("SignAssembly", new AddPropertyTransform<CommonCompilerOptions>("SignAssembly",
"true", "true",
compilerOptions => !string.IsNullOrEmpty(compilerOptions.KeyFile)) compilerOptions => !string.IsNullOrEmpty(compilerOptions.KeyFile)),
.WithMSBuildCondition(" '$(OS)' == 'Windows_NT' "),
new AddPropertyTransform<CommonCompilerOptions>("PublicSign", new AddPropertyTransform<CommonCompilerOptions>("PublicSign",
"true", "true",
compilerOptions => !string.IsNullOrEmpty(compilerOptions.KeyFile) && (compilerOptions.PublicSign == null)) compilerOptions => !string.IsNullOrEmpty(compilerOptions.KeyFile) && (compilerOptions.PublicSign == null))

5
test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateBuildOptions.cs
View file

@ -261,12 +261,11 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
} }
}"); }");
mockProj.Properties.Count(p => p.Name == "KeyOriginatorFile").Should().Be(1); mockProj.Properties.Count(p => p.Name == "AssemblyOriginatorKeyFile").Should().Be(1);
mockProj.Properties.First(p => p.Name == "KeyOriginatorFile").Value.Should().Be("../keyfile.snk"); mockProj.Properties.First(p => p.Name == "AssemblyOriginatorKeyFile").Value.Should().Be("../keyfile.snk");
mockProj.Properties.Count(p => p.Name == "SignAssembly").Should().Be(1); mockProj.Properties.Count(p => p.Name == "SignAssembly").Should().Be(1);
mockProj.Properties.First(p => p.Name == "SignAssembly").Value.Should().Be("true"); mockProj.Properties.First(p => p.Name == "SignAssembly").Value.Should().Be("true");
mockProj.Properties.First(p => p.Name == "SignAssembly").Condition.Should().Be(" '$(OS)' == 'Windows_NT' ");
mockProj.Properties.Count(p => p.Name == "PublicSign").Should().Be(1); mockProj.Properties.Count(p => p.Name == "PublicSign").Should().Be(1);
mockProj.Properties.First(p => p.Name == "PublicSign").Value.Should().Be("true"); mockProj.Properties.First(p => p.Name == "PublicSign").Value.Should().Be("true");

5
test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs
View file

@ -44,13 +44,14 @@ namespace Microsoft.DotNet.Migration.Tests
VerifyAllMSBuildOutputsRunnable(projectDirectory); VerifyAllMSBuildOutputsRunnable(projectDirectory);
} }
public void It_migrates_signed_apps(string projectName) [Fact]
public void It_migrates_signed_apps()
{ {
var projectDirectory = TestAssetsManager.CreateTestInstance("TestAppWithSigning", callingMethod: "i").WithLockFiles().Path; var projectDirectory = TestAssetsManager.CreateTestInstance("TestAppWithSigning", callingMethod: "i").WithLockFiles().Path;
CleanBinObj(projectDirectory); CleanBinObj(projectDirectory);
var outputComparisonData = BuildProjectJsonMigrateBuildMSBuild(projectDirectory, projectName); var outputComparisonData = BuildProjectJsonMigrateBuildMSBuild(projectDirectory, "TestAppWithSigning");
var outputsIdentical = var outputsIdentical =
outputComparisonData.ProjectJsonBuildOutputs.SetEquals(outputComparisonData.MSBuildBuildOutputs); outputComparisonData.ProjectJsonBuildOutputs.SetEquals(outputComparisonData.MSBuildBuildOutputs);