Skip to content

Fixed dependency bugs #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ryan-seifi wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fixed dependency bugs #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
97fa9f4
Add GCop.UAT reference to Website and Domain project
iPazooki Sep 10, 2018
19456f5
Removed wrong GCop reference
iPazooki Sep 10, 2018
dade7ec
Changed the constructor in Startup.cs and update all nuget packages
iPazooki Sep 14, 2018
1ade550
Update Website.csproj
ryan-seifi Sep 14, 2018
a0386b1
Update Domain.csproj
ryan-seifi Sep 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Template/Domain/Domain.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
Expand All @@ -10,19 +10,19 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.2" />
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.4" />
Copy link
Contributor

@iPazooki iPazooki Sep 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have update .net core to V2.1.4. in case of merging this PR, we need to update Olive too

Copy link
Contributor Author

@ryan-seifi ryan-seifi Sep 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then I'll do it too.
Because dotnetcore v 2.1.2 causes serious problems for one of our users.

<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Olive" Version="1.0.99" />
<PackageReference Include="Olive" Version="1.0.110" />
<PackageReference Include="Olive.Audit" Version="1.0.32" />
<PackageReference Include="Olive.CSV" Version="1.0.21" />
<PackageReference Include="Olive.Drawing" Version="1.0.20" />
<PackageReference Include="Olive.Encryption" Version="2.1.43" />
<PackageReference Include="Olive.Entities" Version="1.0.51" />
<PackageReference Include="Olive.Entities.Data" Version="1.0.57" />
<PackageReference Include="Olive.Entities.Data.SqlServer" Version="1.0.26" />
<PackageReference Include="Olive.Entities" Version="1.0.60" />
<PackageReference Include="Olive.Entities.Data" Version="1.0.61" />
<PackageReference Include="Olive.Entities.Data.SqlServer" Version="1.0.27" />
<PackageReference Include="Olive.Integration" Version="1.0.7" />
<PackageReference Include="Olive.Mvc.Security" Version="2.1.46" />
<PackageReference Include="Olive.Security.Impersonation" Version="1.0.28" />
<PackageReference Include="Olive.Web" Version="2.1.42" />
<PackageReference Include="Olive.Web" Version="2.1.43" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions Template/M#/Model/#Model.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MSharp" Version="4.1.273" />
<PackageReference Include="Olive" Version="1.0.99" />
<PackageReference Include="MSharp" Version="4.1.309" />
<PackageReference Include="Olive" Version="1.0.110" />
</ItemGroup>
<Target Name="Generate code" AfterTargets="AfterBuild">
<Exec Command="start /D &quot;$(TargetDir)&quot; &quot;&quot; dotnet msharp.dsl.dll /build /model" />
Expand Down
6 changes: 3 additions & 3 deletions Template/M#/UI/#UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MSharp" Version="4.1.273" />
<PackageReference Include="Olive" Version="1.0.99" />
<PackageReference Include="Olive.Entities" Version="1.0.51" />
<PackageReference Include="MSharp" Version="4.1.309" />
<PackageReference Include="Olive" Version="1.0.110" />
<PackageReference Include="Olive.Entities" Version="1.0.60" />
<ProjectReference Include="..\..\Domain\Domain.csproj" />
</ItemGroup>

Expand Down
30 changes: 15 additions & 15 deletions Template/Website/Website.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,33 +26,33 @@
<_ContentIncludedByDefault Remove="wwwroot\styles\FrontEnd-Modal.css" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Hangfire" Version="1.6.19" />
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="2.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="2.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="2.1.1" />
<PackageReference Include="Hangfire" Version="1.6.20" />
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.4" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="2.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="2.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="2.1.2" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Olive" Version="1.0.99" />
<PackageReference Include="Olive" Version="1.0.110" />
<PackageReference Include="Olive.Audit" Version="1.0.32" />
<PackageReference Include="Olive.Audit.DatabaseLogger" Version="1.0.35" />
<PackageReference Include="Olive.CSV" Version="1.0.21" />
<PackageReference Include="Olive.Drawing" Version="1.0.20" />
<PackageReference Include="Olive.Encryption" Version="2.1.43" />
<PackageReference Include="Olive.Entities" Version="1.0.51" />
<PackageReference Include="Olive.Entities.Data" Version="1.0.57" />
<PackageReference Include="Olive.Entities.Data.SqlServer" Version="1.0.26" />
<PackageReference Include="Olive.Export" Version="1.0.20" />
<PackageReference Include="Olive.Entities" Version="1.0.60" />
<PackageReference Include="Olive.Entities.Data" Version="1.0.61" />
<PackageReference Include="Olive.Entities.Data.SqlServer" Version="1.0.27" />
<PackageReference Include="Olive.Export" Version="1.0.22" />
<PackageReference Include="Olive.Hangfire" Version="1.0.33" />
<PackageReference Include="Olive.Integration" Version="1.0.7" />
<PackageReference Include="Olive.Mvc" Version="1.0.127" />
<PackageReference Include="Olive.Mvc" Version="1.0.141" />
<PackageReference Include="Olive.Mvc.Paging" Version="1.0.15" />
<PackageReference Include="Olive.PDF" Version="1.0.16" />
<PackageReference Include="Olive.Mvc.Security" Version="2.1.46" />
<PackageReference Include="Olive.Security.Auth0" Version="1.0.13" />
<PackageReference Include="Olive.Security.Impersonation" Version="1.0.28" />
<PackageReference Include="Olive.Testing" Version="1.0.63" />
<PackageReference Include="Olive.Web" Version="2.1.42" />
<PackageReference Include="SkiaSharp" Version="1.60.2" />
<PackageReference Include="Olive.Testing" Version="1.0.70" />
<PackageReference Include="Olive.Web" Version="2.1.43" />
<PackageReference Include="SkiaSharp" Version="1.60.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Domain\Domain.csproj" />
Expand All @@ -69,4 +69,4 @@
<Target Name="WebCompileClean" AfterTargets="CoreClean" Condition="'$(RunWebCompiler)' != 'False'">
<WebCompiler.CompilerCleanTask ContinueOnError="true" FileName="$(MSBuildProjectDirectory)\compilerconfig.json" />
</Target>
</Project>
</Project>
13 changes: 8 additions & 5 deletions Template/Website/app_Start/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using Domain;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Olive;
using Olive.Entities.Data;
Expand All @@ -13,6 +14,8 @@

public class Startup : Olive.Mvc.Startup
{
public Startup(IHostingEnvironment env, IConfiguration config) : base(env, config) { }

protected override CultureInfo GetRequestCulture() => new CultureInfo("en-GB");

public override void ConfigureServices(IServiceCollection services)
Expand All @@ -24,19 +27,19 @@ public override void ConfigureServices(IServiceCollection services)
services.AddScheduledTasks();
}

public override void Configure(IApplicationBuilder app, IHostingEnvironment env)
public override void Configure(IApplicationBuilder app)
{
if (env.IsDevelopment()) app.UseWebTest(config => config.AddTasks());
if (Environment.IsDevelopment()) app.UseWebTest(config => config.AddTasks());

base.Configure(app, env);
base.Configure(app);

if (Config.Get<bool>("Automated.Tasks:Enabled"))
app.UseScheduledTasks(TaskManager.Run);
}

public override async Task OnStartUpAsync(IApplicationBuilder app, IHostingEnvironment env)
public override async Task OnStartUpAsync(IApplicationBuilder app)
{
if (env.IsDevelopment())
if (Environment.IsDevelopment())
await app.InitializeTempDatabase<SqlServerManager>(() => ReferenceData.Create());

// Add any other initialization logic that needs the database to be ready here.
Expand Down