Skip to content

Commit

Permalink
Upgrad .NET Core to 1.1.1 with .csproj; upgrade packages etc (#31)
Browse files Browse the repository at this point in the history
* Upgraded .NET core to 1.1, upgraded packages including react hot loader to work with the latest version of webpack
* Added solution file
* Fixed solution file
* Updated travis for dotnet core
* Fixed typo in package.json
  • Loading branch information
gsaadeh authored and koistya committed Apr 3, 2017
1 parent b46715e commit 1b39f5e
Show file tree
Hide file tree
Showing 8 changed files with 168 additions and 175 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -7,7 +7,7 @@ before_install:
- sudo sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list'
- sudo apt-key adv --keyserver apt-mo.trafficmanager.net --recv-keys 417A0893
- sudo apt-get update
- sudo apt-get install dotnet-dev-1.0.0-preview2-003121
- sudo apt-get install dotnet-dev-1.0.1
script:
- npm run lint
- npm run test
28 changes: 15 additions & 13 deletions package.json
Expand Up @@ -11,12 +11,12 @@
"classnames": "2.2.5",
"fastclick": "1.0.6",
"history": "3.0.0",
"react": "15.3.1",
"react-dom": "15.3.1",
"react": "15.4.1",
"react-dom": "15.4.1",
"react-mdl": "1.7.1",
"react-redux": "5.0.0-beta.1",
"redux": "3.5.2",
"whatwg-fetch": "1.0.0"
"redux": "3.6.0",
"whatwg-fetch": "^2.0.3"
},
"devDependencies": {
"assets-webpack-plugin": "^3.4.0",
Expand All @@ -35,16 +35,17 @@
"babel-runtime": "^6.11.6",
"browser-sync": "^2.14.3",
"chai": "^3.5.0",
"cpy": "^4.0.1",
"css-loader": "^0.24.0",
"cpy": "^5.0.0",
"css-loader": "^0.28.0",
"del": "^2.2.2",
"eslint": "^3.4.0",
"eslint-config-airbnb": "^10.0.1",
"eslint-plugin-import": "^1.14.0",
"eslint-plugin-jsx-a11y": "^2.2.1",
"eslint-plugin-react": "^6.2.0",
"file-loader": "^0.9.0",
"front-matter": "^2.1.0",
"extract-text-webpack-plugin": "^2.1.0",
"file-loader": "^0.11.1",
"front-matter": "^2.1.2",
"highlight.js": "^9.6.0",
"json-loader": "^0.5.4",
"markdown-it": "^7.0.1",
Expand All @@ -69,17 +70,18 @@
"style-loader": "^0.13.1",
"stylelint": "^7.2.0",
"stylelint-config-standard": "^13.0.0",
"url-loader": "^0.5.7",
"webpack": "2.1.0-beta.22",
"webpack-dev-middleware": "^1.6.1",
"webpack-hot-middleware": "^2.12.2"
"url-loader": "^0.5.8",
"webpack": "^2.2.0",
"webpack-dev-middleware": "^1.10.1",
"webpack-hot-middleware": "^2.18.0"
},
"babel": {
"presets": [
"latest",
"react"
],
"plugins": [
"react-hot-loader/babel",
"transform-class-properties",
"transform-object-rest-spread",
[
Expand Down Expand Up @@ -116,7 +118,7 @@
}
},
"scripts": {
"postinstall": "dotnet restore server server.test",
"postinstall": "dotnet restore server && dotnet restore server.test",
"eslint": "eslint client client.test run.js webpack.config.js",
"stylelint": "stylelint \"client/components/**/*.css\" \"client/views/**/*.css\"",
"lint": "npm run eslint && npm run stylelint",
Expand Down
35 changes: 0 additions & 35 deletions server.test/project.json

This file was deleted.

19 changes: 19 additions & 0 deletions server.test/server.test.csproj
@@ -0,0 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp1.1</TargetFramework>
<PreserveCompilationContext>true</PreserveCompilationContext>
<AssemblyName>server.test</AssemblyName>
<PackageId>server.test</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
<PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta5-build1225" />
<PackageReference Include="xunit" Version="2.2.0-beta5-build3474" />
</ItemGroup>

</Project>
72 changes: 0 additions & 72 deletions server/project.json

This file was deleted.

48 changes: 48 additions & 0 deletions server/server.csproj
@@ -0,0 +1,48 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netcoreapp1.1</TargetFramework>
<DebugType>portable</DebugType>
<PreserveCompilationContext>true</PreserveCompilationContext>
<AssemblyName>server</AssemblyName>
<OutputType>Exe</OutputType>
<PackageId>server</PackageId>
<RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
<PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
</PropertyGroup>

<ItemGroup>
<None Update="Views\**\*">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</None>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Antiforgery" Version="1.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="1.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="1.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="1.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="1.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="1.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="1.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.1" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="1.1.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="1.0.0">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.2-beta1" />
</ItemGroup>

<ItemGroup>
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="1.0.0" />
<DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="1.0.0" />
</ItemGroup>

</Project>
28 changes: 28 additions & 0 deletions starter-kit.sln
@@ -0,0 +1,28 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26228.4
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Server", "Server\server.csproj", "{F951ECB5-132F-4A28-8DA7-66E35356344B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Server.Test", "server.test\server.test.csproj", "{D9762B10-6A14-4464-9141-66DC196545C0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{F951ECB5-132F-4A28-8DA7-66E35356344B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F951ECB5-132F-4A28-8DA7-66E35356344B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F951ECB5-132F-4A28-8DA7-66E35356344B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F951ECB5-132F-4A28-8DA7-66E35356344B}.Release|Any CPU.Build.0 = Release|Any CPU
{D9762B10-6A14-4464-9141-66DC196545C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D9762B10-6A14-4464-9141-66DC196545C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D9762B10-6A14-4464-9141-66DC196545C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D9762B10-6A14-4464-9141-66DC196545C0}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

0 comments on commit 1b39f5e

Please sign in to comment.