Skip to content
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.

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

.NET Core 3.0 previewを適用 #86

Merged
merged 5 commits into from Jul 3, 2019
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

@@ -13,11 +13,9 @@ addons:

before_install:
# build environment
- wget -q https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb
- sudo dpkg -i packages-microsoft-prod.deb
- sudo apt-get install apt-transport-https
- sudo apt-get update
- sudo apt-get install dotnet-sdk-2.2
- sudo snap install dotnet-sdk --beta --classic
- sudo snap alias dotnet-sdk.dotnet dotnet
- dotnet --version
- python --version
- pip --version
@@ -1,6 +1,6 @@
tetsujin
========

ASP.NET Core MVC(.NET Core 2.0)を使ったブログエンジン。GithubへのプッシュでTravisCI→(Docker Hub→)Hyper.shへの自動デプロイ。
ASP.NET Core MVC(.NET Core 3.x)を使ったブログエンジン。GithubへのプッシュでTravisCI→(Docker Hub→)Hyper.shへの自動デプロイ。

[![Build Status](https://travis-ci.org/hMatoba/tetsujin.svg?branch=master)](https://travis-ci.org/hMatoba/tetsujin)
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.2" />
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
</ItemGroup>

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>
@@ -1,4 +1,4 @@
FROM microsoft/dotnet:2.2-aspnetcore-runtime
FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim
ARG source
ENV BUILD_TIME="${BUILD_TIME}"
WORKDIR /app
@@ -55,7 +55,8 @@ public void ConfigureServices(IServiceCollection services)
{
options.Providers.Add<GzipCompressionProvider>();
});
services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
services.AddMvc(options => options.EnableEndpointRouting = false)
.SetCompatibilityVersion(CompatibilityVersion.Version_3_0);

services.AddSingleton<HtmlEncoder>(
HtmlEncoder.Create(allowedRanges: new[] {
File renamed without changes.
@@ -1,18 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
<DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
<UserSecretsId>f6ca7238-49cf-4bf2-be14-a74ba0344c01</UserSecretsId>
</PropertyGroup>

<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="CoreCompat.System.Drawing" Version="1.0.0-beta006" />
<PackageReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="MangoFramework" Version="1.0.7" />
<PackageReference Include="MongoDB.Bson" Version="2.8.0" />
<PackageReference Include="MongoDB.Driver" Version="2.8.0" />
<PackageReference Include="MongoDB.Driver.Core" Version="2.8.0" />
<PackageReference Include="MongoDB.Bson" Version="2.9.0-beta2" />
<PackageReference Include="MongoDB.Driver" Version="2.9.0-beta2" />
<PackageReference Include="MongoDB.Driver.Core" Version="2.9.0-beta2" />
<PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
</ItemGroup>

ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.