This commit is contained in:
Mike Harder 2018-05-10 10:47:46 -07:00 committed by GitHub
parent 2b477bb19b
commit 5dfdf604a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 41 additions and 0 deletions

View File

@ -22,6 +22,12 @@ namespace AspNetCoreSdkTests
OSPlatforms = new[] { OSPlatform.Linux, }, OSPlatforms = new[] { OSPlatform.Linux, },
}; };
public static RuntimeIdentifier OSX_x64 = new RuntimeIdentifier()
{
Name = "osx-x64",
OSPlatforms = new[] { OSPlatform.OSX, },
};
private RuntimeIdentifier() { } private RuntimeIdentifier() { }
public string Name { get; private set; } public string Name { get; private set; }

View File

@ -77,6 +77,7 @@ namespace AspNetCoreSdkTests
Template.GetInstance<WebApiTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.Win_x64), Template.GetInstance<WebApiTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.Win_x64),
// Self-contained, linux-x64 // Self-contained, linux-x64
// ClassLibrary does not require a package source, even for self-contained deployments
Template.GetInstance<ClassLibraryTemplate>(NuGetPackageSource.None, RuntimeIdentifier.Linux_x64), Template.GetInstance<ClassLibraryTemplate>(NuGetPackageSource.None, RuntimeIdentifier.Linux_x64),
Template.GetInstance<ConsoleApplicationTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.Linux_x64), Template.GetInstance<ConsoleApplicationTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.Linux_x64),
Template.GetInstance<RazorClassLibraryTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.Linux_x64), Template.GetInstance<RazorClassLibraryTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.Linux_x64),
@ -87,6 +88,19 @@ namespace AspNetCoreSdkTests
Template.GetInstance<ReactTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.Linux_x64), Template.GetInstance<ReactTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.Linux_x64),
Template.GetInstance<ReactReduxTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.Linux_x64), Template.GetInstance<ReactReduxTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.Linux_x64),
Template.GetInstance<WebApiTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.Linux_x64), Template.GetInstance<WebApiTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.Linux_x64),
// Self-contained, osx-x64
// ClassLibrary does not require a package source, even for self-contained deployments
Template.GetInstance<ClassLibraryTemplate>(NuGetPackageSource.None, RuntimeIdentifier.OSX_x64),
Template.GetInstance<ConsoleApplicationTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.OSX_x64),
Template.GetInstance<RazorClassLibraryTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.OSX_x64),
Template.GetInstance<WebTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.OSX_x64),
Template.GetInstance<RazorTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.OSX_x64),
Template.GetInstance<MvcTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.OSX_x64),
Template.GetInstance<AngularTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.OSX_x64),
Template.GetInstance<ReactTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.OSX_x64),
Template.GetInstance<ReactReduxTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.OSX_x64),
Template.GetInstance<WebApiTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.OSX_x64),
}; };
public static IEnumerable<TestCaseData> RestoreData = _restoreTemplates.Select(t => new TestCaseData(t)); public static IEnumerable<TestCaseData> RestoreData = _restoreTemplates.Select(t => new TestCaseData(t));

View File

@ -2,6 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Text.RegularExpressions;
namespace AspNetCoreSdkTests.Templates namespace AspNetCoreSdkTests.Templates
{ {
@ -29,6 +30,7 @@ namespace AspNetCoreSdkTests.Templates
Path.Combine("netcoreapp2.1", RuntimeIdentifier.Path, "host", $"{Name}"), Path.Combine("netcoreapp2.1", RuntimeIdentifier.Path, "host", $"{Name}"),
} }
}, },
{ RuntimeIdentifier.OSX_x64, () => _additionalObjFilesAfterBuild[RuntimeIdentifier.Linux_x64]() },
}; };
public override IEnumerable<string> ExpectedObjFilesAfterBuild => public override IEnumerable<string> ExpectedObjFilesAfterBuild =>
@ -62,6 +64,10 @@ namespace AspNetCoreSdkTests.Templates
"libhostpolicy.so", "libhostpolicy.so",
}.Select(p => Path.Combine(OutputPath, p))) }.Select(p => Path.Combine(OutputPath, p)))
}, },
{ RuntimeIdentifier.OSX_x64, () =>
_additionalBinFilesAfterBuild[RuntimeIdentifier.Linux_x64]()
.Select(f => Regex.Replace(f, ".so$", ".dylib"))
},
}; };
public override IEnumerable<string> ExpectedBinFilesAfterBuild => public override IEnumerable<string> ExpectedBinFilesAfterBuild =>
@ -334,6 +340,18 @@ namespace AspNetCoreSdkTests.Templates
"System.Security.Cryptography.Native.OpenSsl.so", "System.Security.Cryptography.Native.OpenSsl.so",
}) })
}, },
{ RuntimeIdentifier.OSX_x64, () =>
_additionalFilesAfterPublish[RuntimeIdentifier.Linux_x64]()
.Where(f => f != "createdump")
.Where(f => f != "libcoreclrtraceptprovider.so")
.Where(f => f != "libsosplugin.so")
.Select(f => Regex.Replace(f, ".so$", ".dylib"))
.Concat(new[]
{
"System.Security.Cryptography.Native.Apple.a",
"System.Security.Cryptography.Native.Apple.dylib",
})
}
}; };
public override IEnumerable<string> ExpectedFilesAfterPublish => public override IEnumerable<string> ExpectedFilesAfterPublish =>

View File

@ -31,6 +31,7 @@ namespace AspNetCoreSdkTests.Templates
Path.Combine("netcoreapp2.1", RuntimeIdentifier.Path, "host", $"{Name}"), Path.Combine("netcoreapp2.1", RuntimeIdentifier.Path, "host", $"{Name}"),
}) })
}, },
{ RuntimeIdentifier.OSX_x64, () => _additionalObjFilesAfterBuild[RuntimeIdentifier.Linux_x64]() },
}; };
public override IEnumerable<string> ExpectedObjFilesAfterBuild => public override IEnumerable<string> ExpectedObjFilesAfterBuild =>

View File

@ -345,6 +345,7 @@ namespace AspNetCoreSdkTests.Templates
"System.Private.Uri.dll", "System.Private.Uri.dll",
}) })
}, },
{ RuntimeIdentifier.OSX_x64, () => _additionalFilesAfterPublish[RuntimeIdentifier.Linux_x64]() },
}; };
public override IEnumerable<string> ExpectedFilesAfterPublish => public override IEnumerable<string> ExpectedFilesAfterPublish =>

View File

@ -211,6 +211,7 @@ namespace AspNetCoreSdkTests.Templates
"System.Threading.Channels.dll", "System.Threading.Channels.dll",
}) })
}, },
{ RuntimeIdentifier.OSX_x64, () => _additionalFilesAfterPublish[RuntimeIdentifier.Linux_x64]() },
}; };
public override IEnumerable<string> ExpectedFilesAfterPublish => public override IEnumerable<string> ExpectedFilesAfterPublish =>