Skip to content

Commit

Permalink
Updated to VS 2017 (closes gh-62).
Browse files Browse the repository at this point in the history
  • Loading branch information
ashmind committed Mar 15, 2017
1 parent 6c83525 commit be01040
Show file tree
Hide file tree
Showing 34 changed files with 310 additions and 488 deletions.
32 changes: 32 additions & 0 deletions MirrorSharp.AspNetCore.Demo/MirrorSharp.AspNetCore.Demo.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netcoreapp1.0</TargetFramework>
<PreserveCompilationContext>true</PreserveCompilationContext>
<AssemblyName>MirrorSharp.AspNetCore.Demo</AssemblyName>
<OutputType>Exe</OutputType>
<PackageId>MirrorSharp.AspNetCore.Demo</PackageId>
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
<PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
</PropertyGroup>

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

<ItemGroup>
<ProjectReference Include="..\MirrorSharp.AspNetCore\MirrorSharp.AspNetCore.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.0.3" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.0.2" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.0.2" />
<PackageReference Include="Microsoft.AspNetCore.WebSockets.Server" Version="0.1.0" />
</ItemGroup>

</Project>
25 changes: 0 additions & 25 deletions MirrorSharp.AspNetCore.Demo/MirrorSharp.AspNetCore.Demo.xproj

This file was deleted.

2 changes: 1 addition & 1 deletion MirrorSharp.AspNetCore.Demo/Program.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.IO;
using Microsoft.AspNetCore.Hosting;

namespace MirrorSharp.Demo {
namespace MirrorSharp.AspNetCore.Demo {
public class Program {
public static void Main(string[] args) {
var host = new WebHostBuilder()
Expand Down
3 changes: 1 addition & 2 deletions MirrorSharp.AspNetCore.Demo/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using MirrorSharp.AspNetCore;

namespace MirrorSharp.Demo {
namespace MirrorSharp.AspNetCore.Demo {
public class Startup {
// This method gets called by the runtime. Use this method to add services to the container.
// For more information on how to configure your application, visit http://go.microsoft.com/fwlink/?LinkID=398940
Expand Down
50 changes: 0 additions & 50 deletions MirrorSharp.AspNetCore.Demo/project.json

This file was deleted.

22 changes: 22 additions & 0 deletions MirrorSharp.AspNetCore/MirrorSharp.AspNetCore.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<VersionPrefix>0.9.0</VersionPrefix>
<TargetFramework>netstandard1.5</TargetFramework>
<AssemblyName>MirrorSharp.AspNetCore</AssemblyName>
<PackageId>MirrorSharp.AspNetCore</PackageId>
<PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\MirrorSharp.Common\MirrorSharp.Common.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="1.0.2" />
</ItemGroup>

</Project>
21 changes: 0 additions & 21 deletions MirrorSharp.AspNetCore/MirrorSharp.AspNetCore.xproj

This file was deleted.

14 changes: 0 additions & 14 deletions MirrorSharp.AspNetCore/project.json

This file was deleted.

24 changes: 24 additions & 0 deletions MirrorSharp.Benchmarks/MirrorSharp.Benchmarks.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp1.0</TargetFramework>
<AssemblyName>MirrorSharp.Benchmarks</AssemblyName>
<OutputType>Exe</OutputType>
<PackageId>MirrorSharp.Benchmarks</PackageId>
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
<PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8+wp8+wpa81;portable-net45+win8</PackageTargetFallback>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\MirrorSharp.Common\MirrorSharp.Common.csproj" />
<ProjectReference Include="..\MirrorSharp.Testing\MirrorSharp.Testing.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.9.9" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
</ItemGroup>

</Project>
21 changes: 0 additions & 21 deletions MirrorSharp.Benchmarks/MirrorSharp.Benchmarks.xproj

This file was deleted.

23 changes: 0 additions & 23 deletions MirrorSharp.Benchmarks/project.json

This file was deleted.

46 changes: 46 additions & 0 deletions MirrorSharp.Common/MirrorSharp.Common.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Description>MirrorSharp shared server library. MirrorSharp is a code editor &lt;textarea&gt; built on Roslyn — see https://github.com/ashmind/mirrorsharp/blob/master/README.md for details.</Description>
<VersionPrefix>0.9.0</VersionPrefix>
<Authors>Andrey Shchekin</Authors>
<TargetFrameworks>netstandard1.5;net452</TargetFrameworks>
<AssemblyName>MirrorSharp.Common</AssemblyName>
<PackageId>MirrorSharp.Common</PackageId>
<PackageTags>Roslyn;CodeMirror</PackageTags>
<PackageProjectUrl>https://github.com/ashmind/mirrorsharp</PackageProjectUrl>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/ashmind/mirrorsharp.git</RepositoryUrl>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.5' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8+wp8+wpa81;portable-net45+win8</PackageTargetFallback>
<RootNamespace>MirrorSharp</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="10.1.5" />
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="1.3.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="1.3.2" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="1.3.2" />
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="1.3.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="1.3.2" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="1.3.2" />
<PackageReference Include="AshMind.Extensions" Version="2.0.0-pre-20160719" />
<PackageReference Include="System.Buffers" Version="4.0.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
<PackageReference Include="System.Net.WebSockets" Version="4.0.0" />
<PackageReference Include="System.Threading.Tasks" Version="4.0.11" />
</ItemGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
<PackageReference Include="System.Threading.Tasks" Version="4.0.11" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

</Project>
19 changes: 0 additions & 19 deletions MirrorSharp.Common/MirrorSharp.Common.xproj

This file was deleted.

46 changes: 0 additions & 46 deletions MirrorSharp.Common/project.json

This file was deleted.

Loading

0 comments on commit be01040

Please sign in to comment.