Skip to content

.NET SDK and package updates #67

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

Merged
ForNeVeR merged 4 commits into from
Jul 9, 2017
Merged

.NET SDK and package updates #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0360210
#65: update .NET Core SDK
ForNeVeR Jul 9, 2017
ce360a6
#65: update npm shrinkwrap file to the package.lock format
ForNeVeR Jul 9, 2017
3f03b41
#65: update library versions
ForNeVeR Jul 9, 2017
5cdc7e2
#65: update CI configurations
ForNeVeR Jul 9, 2017
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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ sudo: required
dist: trusty
language: csharp
mono: none
dotnet: 1.0.0-preview2-003121
dotnet: 1.0.4
node_js: 6
install:
- npm install
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 0.6.3.{build}
version: 0.7.3.{build}
before_build:
- npm install
- dotnet restore
Expand Down
28 changes: 28 additions & 0 deletions codingteam.org.ru.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<Project Sdk="FSharp.NET.Sdk;Microsoft.NET.Sdk.Web">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp1.1</TargetFramework>
<ServerGarbageCollection>true</ServerGarbageCollection>
<ConcurrentGarbageCollection>false</ConcurrentGarbageCollection>
<PreserveCompilationContext>true</PreserveCompilationContext>
<Version>0.7.3</Version>
</PropertyGroup>
<ItemGroup>
<Compile Include="Server/CtorSettings.fs" />
<Compile Include="Server/Controllers/HomeController.fs" />
<Compile Include="Server/Startup.fs" />
<Compile Include="Server/Program.fs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="FSharp.NET.Sdk" Version="1.*" PrivateAssets="All" />
<PackageReference Include="FSharp.Core" Version="4.*" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.2" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" />
<PackageReference Include="Microsoft.Extensions.Options" Version="1.1.2" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "1.0.0-preview2-003131"
"version": "1.0.4"
}
}
137 changes: 55 additions & 82 deletions npm-shrinkwrap.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 0 additions & 50 deletions project.json
View file
Open in desktop

This file was deleted.

Loading