Skip to content

Commit

Permalink
Merge pull request #40 from ForEvolve/update-dependencies
Browse files Browse the repository at this point in the history 
Update dependencies
  • Loading branch information
@Carl-Hugo
Carl-Hugo committed Dec 4, 2018
2 parents 7f0a36b + f48c8c5 commit 292936c
Show file tree
Hide file tree
Showing 33 changed files with 117 additions and 60 deletions.
3 changes: 3 additions & 0 deletions .gitignore
View file
Expand Up @@ -260,3 +260,6 @@ local-build.ps1
local-signed.ps1
local-test.ps1
local-test-output/

# VS Code
.vscode/
17 changes: 17 additions & 0 deletions Dependencies.Build.props
View file
@@ -0,0 +1,17 @@
<Project>
<PropertyGroup>
<!-- ForEvolve packages -->
<ForEvolvePackagesVersion Condition="'$(FOREVOLVE_PACKAGES_VERSION)'==''">[1.0.0-RC-1,2.0)</ForEvolvePackagesVersion>
<ForEvolvePhantomJsDependenciesPackagesVersion Condition="'$(FOREVOLVE_PHANTOMJS_DEPENDENCIES_PACKAGES_VERSION)'==''">1.0.0-RC-1</ForEvolvePhantomJsDependenciesPackagesVersion>

<!-- Source packages -->
<ForEvolveNetCoreVersion Condition="'$(FOREVOLVE_ASPNETCORE_VERSION)'==''">[2.1.1,3.0)</ForEvolveNetCoreVersion>
<ForEvolveIdentityVersion Condition="'$(FOREVOLVE_IDENTITY_VERSION)'==''">[2.1.2,3.0)</ForEvolveIdentityVersion>

<!-- Tests packages -->
<ForEvolveAspNetCoreTestHostVersion Condition="'$(FOREVOLVE_ASPNETCORE_TESTHOST_VERSION)'==''">2.1.1</ForEvolveAspNetCoreTestHostVersion>
<ForEvolveXunitVersion Condition="'$(FOREVOLVE_XUNIT_VERSION)'==''">2.4.1</ForEvolveXunitVersion>
<ForEvolveMoqVersion Condition="'$(FOREVOLVE_MOQ_VERSION)'==''">4.8.3</ForEvolveMoqVersion>
<ForEvolveTestSdkVersion Condition="'$(FOREVOLVE_TEST_SDK_VERSION)'==''">15.8.0</ForEvolveTestSdkVersion>
</PropertyGroup>
</Project>
1 change: 1 addition & 0 deletions Directory.Build.props
View file
@@ -1,4 +1,5 @@
<Project>
<Import Project="Dependencies.Build.props" />

<PropertyGroup>
<Product>ForEvolve Framework</Product>
Expand Down
21 changes: 20 additions & 1 deletion ForEvolve Framework.sln
View file
Expand Up @@ -61,7 +61,24 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ForEvolve.Pdf.PhantomJs.Fun
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ForEvolve.Pdf.PhantomJs.AppWeb.FunctionalTests", "test\ForEvolve.Pdf.PhantomJs.AppWeb.FunctionalTests\ForEvolve.Pdf.PhantomJs.AppWeb.FunctionalTests.csproj", "{EC870698-73D5-4DAF-8C31-8C5DE4856581}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ForEvolve.Pdf.PhantomJs.AppShared.FunctionalTests", "test\ForEvolve.Pdf.PhantomJs.AppShared.FunctionalTests\ForEvolve.Pdf.PhantomJs.AppShared.FunctionalTests.csproj", "{A4FB0104-7CA2-4432-B74E-2F1889B1E9B2}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ForEvolve.Pdf.PhantomJs.AppShared.FunctionalTests", "test\ForEvolve.Pdf.PhantomJs.AppShared.FunctionalTests\ForEvolve.Pdf.PhantomJs.AppShared.FunctionalTests.csproj", "{A4FB0104-7CA2-4432-B74E-2F1889B1E9B2}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{4BBA5443-A431-41F2-9F59-2A456FD315B3}"
ProjectSection(SolutionItems) = preProject
src\Directory.Build.props = src\Directory.Build.props
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{65517671-D568-4787-AACE-920BEAF27CA7}"
ProjectSection(SolutionItems) = preProject
test\Directory.Build.props = test\Directory.Build.props
test\TestServer.Build.props = test\TestServer.Build.props
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{1ACBA303-2C89-4AC8-A594-AC2EAFCA3306}"
ProjectSection(SolutionItems) = preProject
Dependencies.Build.props = Dependencies.Build.props
Directory.Build.props = Directory.Build.props
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -442,6 +459,8 @@ Global
{54ED6613-EBDA-4EDB-B4DA-F1165013915C} = {64EABBA2-1A28-494B-8D8E-A0F84D7322E4}
{EC870698-73D5-4DAF-8C31-8C5DE4856581} = {64EABBA2-1A28-494B-8D8E-A0F84D7322E4}
{A4FB0104-7CA2-4432-B74E-2F1889B1E9B2} = {64EABBA2-1A28-494B-8D8E-A0F84D7322E4}
{4BBA5443-A431-41F2-9F59-2A456FD315B3} = {058CB79A-1B3F-4FF1-A281-0B4E6DF6DB92}
{65517671-D568-4787-AACE-920BEAF27CA7} = {64EABBA2-1A28-494B-8D8E-A0F84D7322E4}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {806775E5-2CAA-4D17-A625-09AB1E764769}
Expand Down
10 changes: 10 additions & 0 deletions deploy-all-packages-in-directory.ps1
View file
@@ -0,0 +1,10 @@
param(
[Alias('k')]
[string]$Key,
[Alias('s')]
[string]$sourceUri = 'https://api.nuget.org/v3/index.json '
)

Get-ChildItem . -filter *.nupkg | Foreach-Object {
dotnet nuget push $_.FullName -k $Key -s $sourceUri
}
2 changes: 1 addition & 1 deletion src/Directory.Build.props
View file
Expand Up @@ -22,7 +22,7 @@
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63127-02" PrivateAssets="All"/>
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions src/ForEvolve.AspNetCore/ForEvolve.AspNetCore.csproj
View file
Expand Up @@ -7,9 +7,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore" Version="$(ForEvolveNetCoreVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(ForEvolveNetCoreVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="$(ForEvolveIdentityVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ForEvolve.Azure/ForEvolve.Azure.csproj
View file
Expand Up @@ -5,7 +5,7 @@
<PackageTags>forevolve,azure,storage,table,blob,queue,key,vault,aspnetcore,asp.net,core,aspnet,asp</PackageTags>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore" Version="$(ForEvolveNetCoreVersion)" />
<PackageReference Include="Microsoft.Azure.KeyVault" Version="2.3.2" />
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="3.19.4" />
<PackageReference Include="WindowsAzure.Storage" Version="9.1.1" />
Expand Down
8 changes: 4 additions & 4 deletions src/ForEvolve.DynamicInternalServerError/ForEvolve.DynamicInternalServerError.csproj
View file
Expand Up @@ -6,10 +6,10 @@
<PackageTags>forevolve,error,internalservererror,exception,aspnetcore,asp.net,core,aspnet,asp</PackageTags>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="$(ForEvolveNetCoreVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="$(ForEvolveNetCoreVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="$(ForEvolveNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(ForEvolveNetCoreVersion)" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ForEvolve.Contracts\ForEvolve.Contracts.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion src/ForEvolve.Markdown/ForEvolve.Markdown.csproj
View file
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="Markdig" Version="0.15.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(ForEvolveNetCoreVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ForEvolve.Pdf/ForEvolve.Pdf.csproj
View file
Expand Up @@ -15,7 +15,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(ForEvolveNetCoreVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
16 changes: 8 additions & 8 deletions src/ForEvolve.XUnit/ForEvolve.XUnit.csproj
View file
Expand Up @@ -7,15 +7,15 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Moq" Version="4.8.3" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="Microsoft.AspNetCore" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.1.0" />
<packageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="2.1.0" />
<PackageReference Include="Moq" Version="$(ForEvolveMoqVersion)" />
<PackageReference Include="xunit" Version="$(ForEvolveXunitVersion)" />
<PackageReference Include="Microsoft.AspNetCore" Version="$(ForEvolveNetCoreVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(ForEvolveNetCoreVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="$(ForEvolveIdentityVersion)" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(ForEvolveAspNetCoreTestHostVersion)" />
<packageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(ForEvolveNetCoreVersion)" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\ForEvolve.AspNetCore\ForEvolve.AspNetCore.csproj" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/ArgsLoggerConsole/ArgsLoggerConsole.csproj
View file
Expand Up @@ -3,7 +3,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup>

</Project>
12 changes: 6 additions & 6 deletions test/Directory.Build.props
View file
Expand Up @@ -5,12 +5,12 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
<PackageReference Include="Moq" Version="4.9.0" />
<PackageReference Include="xunit" Version="2.4.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(ForEvolveAspNetCoreTestHostVersion)" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(ForEvolveNetCoreVersion)" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(ForEvolveTestSdkVersion)" />
<PackageReference Include="Moq" Version="$(ForEvolveMoqVersion)" />
<PackageReference Include="xunit" Version="$(ForEvolveXunitVersion)" />
<PackageReference Include="xunit.runner.visualstudio" Version="$(ForEvolveXunitVersion)" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.4.0-beta.1.build3958" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion test/ForEvolve.AspNetCore.Tests/ForEvolve.AspNetCore.Tests.csproj
View file
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
<RootNamespace>ForEvolve.AspNetCore</RootNamespace>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion test/ForEvolve.Azure.Tests/ForEvolve.Azure.Tests.csproj
View file
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
<RootNamespace>ForEvolve.Azure</RootNamespace>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion test/ForEvolve.Contracts.Tests/ForEvolve.Contracts.Tests.csproj
View file
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
<RootNamespace>ForEvolve.Contracts</RootNamespace>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion test/ForEvolve.Core.Tests/ForEvolve.Core.Tests.csproj
View file
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
<RootNamespace>ForEvolve</RootNamespace>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...alServerError.FunctionalTests/ForEvolve.DynamicInternalServerError.FunctionalTests.csproj
View file
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions ...erError.Swagger.TWebServer/ForEvolve.DynamicInternalServerError.Swagger.TWebServer.csproj
View file
Expand Up @@ -3,14 +3,14 @@
<Import Project="..\TestServer.Build.props" />

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(ForEvolveNetCoreVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(ForEvolveNetCoreVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(ForEvolveNetCoreVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(ForEvolveNetCoreVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...ternalServerError.Swagger.Tests/ForEvolve.DynamicInternalServerError.Swagger.Tests.csproj
View file
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
14 changes: 7 additions & 7 deletions ...amicInternalServerError.TWebServer/ForEvolve.DynamicInternalServerError.TWebServer.csproj
View file
Expand Up @@ -3,16 +3,16 @@
<Import Project="..\TestServer.Build.props" />

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(ForEvolveNetCoreVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(ForEvolveNetCoreVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(ForEvolveNetCoreVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(ForEvolveNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(ForEvolveNetCoreVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="$(ForEvolveNetCoreVersion)" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\ForEvolve.DynamicInternalServerError\ForEvolve.DynamicInternalServerError.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion ...Evolve.DynamicInternalServerError.Tests/ForEvolve.DynamicInternalServerError.Tests.csproj
View file
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/ForEvolve.Markdown.Tests/ForEvolve.Markdown.Tests.csproj
View file
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
<RootNamespace>ForEvolve.Markdown</RootNamespace>
</PropertyGroup>

Expand Down
2 changes: 2 additions & 0 deletions test/ForEvolve.Pdf.PhantomJs.AppConsole.FunctionalTests/Directory.Build.props
View file
@@ -1,4 +1,6 @@
<Project>
<Import Project="../../Dependencies.Build.props" />

<PropertyGroup>
<ImportDirectoryBuildProps>false</ImportDirectoryBuildProps>
</PropertyGroup>
Expand Down
8 changes: 3 additions & 5 deletions ...omJs.AppConsole.FunctionalTests/ForEvolve.Pdf.PhantomJs.AppConsole.FunctionalTests.csproj
View file
@@ -1,14 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\TestServer.Build.props" />

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.0" />
<PackageReference Include="ForEvolve.PhantomJs.Dependencies" Version="[1.0.0-upsilon-436,2.0)" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(ForEvolveNetCoreVersion)" />
<PackageReference Include="ForEvolve.PhantomJs.Dependencies" Version="$(ForEvolvePhantomJsDependenciesPackagesVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions test/ForEvolve.Pdf.PhantomJs.AppShared.FunctionalTests/Directory.Build.props
View file
@@ -1,4 +1,6 @@
<Project>
<Import Project="../../Dependencies.Build.props" />

<PropertyGroup>
<ImportDirectoryBuildProps>false</ImportDirectoryBuildProps>
</PropertyGroup>
Expand Down
2 changes: 2 additions & 0 deletions test/ForEvolve.Pdf.PhantomJs.AppWeb.FunctionalTests/Directory.Build.props
View file
@@ -1,4 +1,6 @@
<Project>
<Import Project="../../Dependencies.Build.props" />

<PropertyGroup>
<ImportDirectoryBuildProps>false</ImportDirectoryBuildProps>
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions ...df.PhantomJs.AppWeb.FunctionalTests/ForEvolve.Pdf.PhantomJs.AppWeb.FunctionalTests.csproj
View file
Expand Up @@ -9,9 +9,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="ForEvolve.Pdf" Version="1.0.0-upsilon-474" />
<PackageReference Include="ForEvolve.PhantomJs.Dependencies" Version="1.0.0-upsilon-437" />
<PackageReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="ForEvolve.Pdf" Version="$(ForEvolvePackagesVersion)" />
<PackageReference Include="ForEvolve.PhantomJs.Dependencies" Version="$(ForEvolvePhantomJsDependenciesPackagesVersion)" />
<PackageReference Include="Microsoft.AspNetCore.App" Version="$(ForEvolveNetCoreVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
5 changes: 3 additions & 2 deletions ...df.PhantomJs.FunctionalTests.Runner/ForEvolve.Pdf.PhantomJs.FunctionalTests.Runner.csproj
View file
@@ -1,12 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<!--<Import Project="../../Dependencies.Build.props" />-->

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore.App" Version="$(ForEvolveNetCoreVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(ForEvolveNetCoreVersion)" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ForEvolve.Pdf.PhantomJs.AppConsole.FunctionalTests\ForEvolve.Pdf.PhantomJs.AppConsole.FunctionalTests.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions test/ForEvolve.Pdf.Tests/ForEvolve.Pdf.Tests.csproj
View file
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
<RootNamespace>ForEvolve.Pdf</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ForEvolve.PhantomJs.Dependencies" Version="[1.0.0-upsilon-436,2.0)" />
<PackageReference Include="ForEvolve.PhantomJs.Dependencies" Version="$(ForEvolvePhantomJsDependenciesPackagesVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 292936c

Please sign in to comment.