mirror of
https://github.com/velopack/velopack.git
synced 2025-10-25 15:19:22 +00:00
Merge branch 'develop' into cs/gh-private4
This commit is contained in:
@@ -9,16 +9,20 @@ namespace Squirrel.Tests
|
||||
{
|
||||
public class RuntimeTests
|
||||
{
|
||||
// we are upgrading net6 to a minimum version of 6.0.2 to work
|
||||
// around a dotnet SDK bug right now.
|
||||
[Theory]
|
||||
[InlineData("net6", "net6-x64")]
|
||||
[InlineData("net6.0", "net6-x64")]
|
||||
[InlineData("net6-x64", "net6-x64")]
|
||||
[InlineData("net6-x86", "net6-x86")]
|
||||
[InlineData("net6", "net6.0.2-x64")]
|
||||
[InlineData("net6.0", "net6.0.2-x64")]
|
||||
[InlineData("net6-x64", "net6.0.2-x64")]
|
||||
[InlineData("net6-x86", "net6.0.2-x86")]
|
||||
[InlineData("net3.1", "netcoreapp3.1-x64")]
|
||||
[InlineData("netcoreapp3.1", "netcoreapp3.1-x64")]
|
||||
[InlineData("net3.1-x86", "netcoreapp3.1-x86")]
|
||||
[InlineData("net6.0.2", "net6.0.2-x64")]
|
||||
[InlineData("net6.0.2-x86", "net6.0.2-x86")]
|
||||
[InlineData("net6.0.1-x86", "net6.0.1-x86")]
|
||||
[InlineData("net6.0.0", "net6-x64")]
|
||||
public void DotnetParsesValidVersions(string input, string expected)
|
||||
{
|
||||
var p = Runtimes.DotnetInfo.Parse(input);
|
||||
|
||||
@@ -341,6 +341,16 @@ namespace Squirrel.Tests
|
||||
Assert.False(fixture.IsInstalledApp);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void SetModelIdDoesNotThrow()
|
||||
{
|
||||
using (var fixture = new UpdateManager(null))
|
||||
fixture.SetProcessAppUserModelId();
|
||||
|
||||
using (var fixture2 = new UpdateManager(null, "TestASD"))
|
||||
fixture2.SetProcessAppUserModelId();
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData(0, 0, 25, 0)]
|
||||
[InlineData(12, 0, 25, 3)]
|
||||
|
||||
Reference in New Issue
Block a user