Merge pull request #303 from Squidex/dnc_21

Dotnet Core 2.1

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.7.0 - 2018-06-25
+
+* Migration to .NET Core 2.1
+
 ## v1.6.2 - 2018-06-23
 
 ### Features
@@ -12,7 +16,6 @@
 
 * **Schemas**: Invariant name handling for field names.
 
-
 ## v1.6.1 - 2018-06-22
 
 ### Bugfixes

Dockerfile

@@ -1,7 +1,7 @@
 #
 # Stage 1, Prebuild
 #
-FROM squidex/aspnetcore-build-phantomjs-chromium:2.0.3-jessie-fix1 as builder
+FROM squidex/dotnet:2.1-sdk-chromium-phantomjs-node as builder
 
 COPY src/Squidex/package.json /tmp/package.json
 
@@ -33,7 +33,7 @@ RUN dotnet publish src/Squidex/Squidex.csproj --output /out/ --configuration Rel
 #
 # Stage 2, Build runtime
 #
-FROM microsoft/aspnetcore:2.0.3-jessie
+FROM microsoft/dotnet:2.1.0-aspnetcore-runtime
 
 # Default AspNetCore directory
 WORKDIR /app

Dockerfile.build

@@ -1,4 +1,4 @@
-FROM squidex/aspnetcore-build-phantomjs-chromium:2.0.3-jessie-fix1 as builder
+FROM squidex/dotnet:2.1-sdk-chromium-phantomjs-node as builder
 
 COPY src/Squidex/package.json /tmp/package.json
 

libs/Dockerfile

@@ -1,4 +1,4 @@
-FROM microsoft/aspnetcore-build:2.0.3-jessie
+FROM microsoft/dotnet:2.1-sdk
 
 # Install runtime dependencies
 RUN apt-get update \
@@ -23,6 +23,15 @@ RUN set -x  \
  && rm -rf /tmp/* /var/lib/apt/lists/*
 
 RUN phantomjs --version
+
+# Install Node
+ENV NODE_VERSION 8.9.4
+ENV NODE_DOWNLOAD_SHA 21fb4690e349f82d708ae766def01d7fec1b085ce1f5ab30d9bda8ee126ca8fc
+RUN curl -SL "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz" --output nodejs.tar.gz \
+ && echo "$NODE_DOWNLOAD_SHA nodejs.tar.gz" | sha256sum -c - \
+ && tar -xzf "nodejs.tar.gz" -C /usr/local --strip-components=1 \
+ && rm nodejs.tar.gz \
+ && ln -s /usr/local/bin/node /usr/local/bin/nodejs
 
 # Install Google Chrome
 

src/Squidex.Domain.Apps.Core.Model/Squidex.Domain.Apps.Core.Model.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>Squidex.Domain.Apps.Core</RootNamespace>
@@ -8,10 +8,10 @@
     <DebugSymbols>True</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Fody" Version="3.0.3" />
-    <PackageReference Include="Freezable.Fody" Version="1.9.0" />
+    <PackageReference Include="Fody" Version="3.1.3" />
+    <PackageReference Include="Freezable.Fody" Version="1.9.1" />
     <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
-    <PackageReference Include="System.ValueTuple" Version="4.4.0" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Squidex.Infrastructure\Squidex.Infrastructure.csproj" />

src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>Squidex.Domain.Apps.Core</RootNamespace>
@@ -14,18 +14,18 @@
     <ProjectReference Include="..\Squidex.Shared\Squidex.Shared.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Algolia.Search" Version="4.2.2" />
-    <PackageReference Include="Elasticsearch.Net" Version="6.0.2" />
+    <PackageReference Include="Algolia.Search" Version="5.0.0" />
+    <PackageReference Include="Elasticsearch.Net" Version="6.1.0" />
     <PackageReference Include="Jint" Version="2.11.58" />
     <PackageReference Include="Microsoft.OData.Core" Version="7.4.4" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="NJsonSchema" Version="9.10.35" />
-    <PackageReference Include="NodaTime" Version="2.2.5" />
+    <PackageReference Include="NJsonSchema" Version="9.10.56" />
+    <PackageReference Include="NodaTime" Version="2.3.0" />
     <PackageReference Include="RefactoringEssentials" Version="5.6.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
     <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
-    <PackageReference Include="System.ValueTuple" Version="4.4.0" />
-    <PackageReference Include="WindowsAzure.Storage" Version="9.1.1" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+    <PackageReference Include="WindowsAzure.Storage" Version="9.2.0" />
   </ItemGroup>
   <PropertyGroup>
     <CodeAnalysisRuleSet>..\..\Squidex.ruleset</CodeAnalysisRuleSet>