Skip to content

Commit 5f81d34

Browse files
mzorecmzorec
committed
Merge branch 'Flubu6.0/Main' into develop
# Conflicts: # src/FlubuCore.WebApi/FlubuCore.WebApi.csproj # src/FlubuCore/Targeting/TargetTree.cs
2 parents 90cb833 + d1e688f commit 5f81d34

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+183
-502
lines changed

‎src/FlubuCore.Analyzers.Tests/FlubuCore.Analyzers.Tests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
4+
<TargetFramework>netcoreapp2.1</TargetFramework>
55
<WarningsAsErrors>true</WarningsAsErrors>
66
<CodeAnalysisRuleSet>..\stylecop.ruleset</CodeAnalysisRuleSet>
77
<NoWarn>1701;1702;1705;1591;1573;1572;1574</NoWarn>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.9.0" />
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
11+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.5.0" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
1313
<PackageReference Include="xunit" Version="2.4.1" />
1414
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
1515
<PrivateAssets>all</PrivateAssets>

‎src/FlubuCore.Analyzers/FlubuCore.Analyzers.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard1.3</TargetFramework>
4+
<TargetFramework>netstandard2.0</TargetFramework>
55
<IncludeBuildOutput>false</IncludeBuildOutput>
66
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
77
<WarningsAsErrors>true</WarningsAsErrors>
@@ -26,7 +26,7 @@
2626
</PropertyGroup>
2727

2828
<ItemGroup>
29-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.9.0" PrivateAssets="all" />
29+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.5.0" PrivateAssets="all" />
3030
<PackageReference Update="NETStandard.Library" PrivateAssets="all" />
3131
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
3232
<PrivateAssets>All</PrivateAssets>

‎src/FlubuCore.Tests/Commanding/CommandParserTests.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,12 @@ public CommandParserTests()
2323
_file = new Mock<IFileWrapper>();
2424
_buildScriptLocator = new Mock<IBuildScriptLocator>();
2525
_flubuConfigurationProvider = new Mock<IFlubuConfigurationProvider>();
26-
_parser = new FlubuCommandParser(new CommandLineApplication(false), _flubuConfigurationProvider.Object, _buildScriptLocator.Object, _file.Object);
26+
27+
var cmdApp = new CommandLineApplication()
28+
{
29+
UnrecognizedArgumentHandling = UnrecognizedArgumentHandling.CollectAndContinue
30+
};
31+
_parser = new FlubuCommandParser(cmdApp, _flubuConfigurationProvider.Object, _buildScriptLocator.Object, _file.Object);
2732
}
2833

2934
[Theory]

‎src/FlubuCore.Tests/FlubuCore.Tests.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFramework>netcoreapp2.1</TargetFramework>
44
<WarningsAsErrors>true</WarningsAsErrors>
@@ -55,21 +55,21 @@
5555
<ProjectReference Include="..\FlubuCore\FlubuCore.csproj" />
5656
</ItemGroup>
5757
<ItemGroup>
58-
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.3.0" />
58+
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="3.0.0" />
5959
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
6060
<PrivateAssets>All</PrivateAssets>
6161
</PackageReference>
6262
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.500-preview2-1-003177" />
63-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
63+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
6464
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
6565
<PrivateAssets>all</PrivateAssets>
6666
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6767
</PackageReference>
6868
<PackageReference Include="xunit" Version="2.4.1" />
6969
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
7070
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.1" />
71-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.1.1" />
72-
<PackageReference Include="moq" Version="4.8.2" />
71+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.3" />
72+
<PackageReference Include="moq" Version="4.13.1" />
7373
</ItemGroup>
7474
<ItemGroup>
7575
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />

‎src/FlubuCore.WebApi.Client/FlubuCore.WebApi.Client.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard1.6;net462</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
55
<AssemblyName>FlubuCore.WebApi.Client</AssemblyName>
66
<WarningsAsErrors>true</WarningsAsErrors>
77
<PackageId>FlubuCore.WebApi.Client</PackageId>
@@ -26,12 +26,12 @@
2626
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net462|AnyCPU'">
2727
<DocumentationFile>bin\Release\net462\FlubuCore.WebApi.Client.xml</DocumentationFile>
2828
</PropertyGroup>
29-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard1.6|AnyCPU'">
30-
<DocumentationFile>bin\Debug\netstandard1.6\FlubuCore.WebApi.Client.xml</DocumentationFile>
29+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
30+
<DocumentationFile>bin\Debug\netstandard2.0\FlubuCore.WebApi.Client.xml</DocumentationFile>
3131
</PropertyGroup>
3232

33-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard1.6|AnyCPU'">
34-
<DocumentationFile>bin\Release\netstandard1.6\FlubuCore.WebApi.Client.xml</DocumentationFile>
33+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
34+
<DocumentationFile>bin\Release\netstandard2.0\FlubuCore.WebApi.Client.xml</DocumentationFile>
3535
</PropertyGroup>
3636

3737
<ItemGroup>

‎src/FlubuCore.WebApi.Model/FlubuCore.WebApi.Model.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard1.4</TargetFramework>
4+
<TargetFramework>netstandard2.0</TargetFramework>
55
<WarningsAsErrors>true</WarningsAsErrors>
66
<AssemblyName>FlubuCore.WebApi.Model</AssemblyName>
77
<PackageId>FlubuCore.WebApi.Model</PackageId>
@@ -20,11 +20,11 @@
2020
<Version>5.0.3</Version><AssemblyVersion>5.0.3.0</AssemblyVersion><FileVersion>5.0.3.0</FileVersion></PropertyGroup>
2121

2222
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
23-
<DocumentationFile>bin\Debug\netstandard1.4\FlubuCore.WebApi.Model.xml</DocumentationFile>
23+
<DocumentationFile>bin\Debug\netstandard2.0\FlubuCore.WebApi.Model.xml</DocumentationFile>
2424
</PropertyGroup>
2525

2626
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
27-
<DocumentationFile>bin\Release\netstandard1.4\FlubuCore.WebApi.Model.xml</DocumentationFile>
27+
<DocumentationFile>bin\Release\netstandard2.0\FlubuCore.WebApi.Model.xml</DocumentationFile>
2828
</PropertyGroup>
2929

3030
<ItemGroup>

‎src/FlubuCore.WebApi.Tests/ClientTests/AuthClientTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public AuthClientTests(ClientFixture clientFixture)
2626
{
2727
_repository = new UserRepository(clientFixture.LiteRepository);
2828
_hashService = new HashService();
29-
clientFixture.LiteRepository.Engine.DropCollection("security");
29+
clientFixture.LiteRepository.Database.DropCollection("security");
3030
}
3131

3232
[Fact]

‎src/FlubuCore.WebApi.Tests/ClientTests/ClientFixture.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public ClientFixture()
2323
LiteRepository = new LiteRepository("Filename=database.db");
2424
_repository = new UserRepository(LiteRepository);
2525
var hashedPassword = _hashService.Hash("password");
26-
LiteRepository.Engine.DropCollection("users");
26+
LiteRepository.Database.DropCollection("users");
2727
_repository.AddUser(new User
2828
{
2929
Username = "User",

‎src/FlubuCore.WebApi.Tests/DatabaseBaseTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class DatabaseBaseTests
1111
public DatabaseBaseTests()
1212
{
1313
LiteRepository = new LiteRepository("Filename=database.db");
14-
LiteRepository.Engine.DropCollection("users");
14+
LiteRepository.Database.DropCollection("users");
1515
}
1616

1717
~DatabaseBaseTests()

‎src/FlubuCore.WebApi.Tests/FlubuCore.WebApi.Tests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
<ItemGroup>
1010
<PackageReference Include="LiteDB" Version="4.1.2" />
11-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.2" />
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
13-
<PackageReference Include="Moq" Version="4.8.2" />
11+
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.3" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
13+
<PackageReference Include="Moq" Version="4.13.1" />
1414
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
1515
<PrivateAssets>all</PrivateAssets>
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

0 commit comments

Comments
 (0)