Skip to content

Commit

Permalink
Move to vs 2017 and fix for @kharlamov about empty spaces in path to …
Browse files Browse the repository at this point in the history
…executable
  • Loading branch information
PeterKottas committed Mar 24, 2017
1 parent 0ccd619 commit e883665
Show file tree
Hide file tree
Showing 9 changed files with 51 additions and 95 deletions.
12 changes: 6 additions & 6 deletions Solution/DotNetCore.WindowsService.sln
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio 15
VisualStudioVersion = 15.0.26228.9
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "PeterKottas.DotNetCore.WindowsService", "..\Source\PeterKottas.DotNetCore.WindowsService\PeterKottas.DotNetCore.WindowsService.xproj", "{19F85232-0FED-439E-90BF-BDCD6567F2B3}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "PeterKottas.DotNetCore.Example", "..\Source\PeterKottas.DotNetCore.Example\PeterKottas.DotNetCore.Example.xproj", "{3F56FC81-7EE5-45E8-864D-5865E3B05D4A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution items", "Solution items", "{8D5372CB-67BA-415A-B9B0-6C3771A6907E}"
ProjectSection(SolutionItems) = preProject
..\global.json = ..\global.json
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PeterKottas.DotNetCore.WindowsService", "..\Source\PeterKottas.DotNetCore.WindowsService\PeterKottas.DotNetCore.WindowsService.csproj", "{19F85232-0FED-439E-90BF-BDCD6567F2B3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PeterKottas.DotNetCore.Example", "..\Source\PeterKottas.DotNetCore.Example\PeterKottas.DotNetCore.Example.csproj", "{3F56FC81-7EE5-45E8-864D-5865E3B05D4A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp1.1</TargetFramework>
<AssemblyName>PeterKottas.DotNetCore.Example</AssemblyName>
<OutputType>Exe</OutputType>
<PackageId>PeterKottas.DotNetCore.Example</PackageId>
<RuntimeIdentifiers>win81-x64;win10-x64</RuntimeIdentifiers>
<PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
<RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\PeterKottas.DotNetCore.WindowsService\PeterKottas.DotNetCore.WindowsService.csproj" />
</ItemGroup>

</Project>

This file was deleted.

25 changes: 0 additions & 25 deletions Source/PeterKottas.DotNetCore.Example/project.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<VersionPrefix>1.0.16</VersionPrefix>
<TargetFramework>netcoreapp1.1</TargetFramework>
<AssemblyName>PeterKottas.DotNetCore.WindowsService</AssemblyName>
<PackageId>PeterKottas.DotNetCore.WindowsService</PackageId>
<PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
<RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<Version>1.0.17</Version>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="DasMulli.Win32.ServiceUtils" Version="1.0.1" />
<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
<PackageReference Include="PeterKottas.DotNetCore.CmdArgParser" Version="1.0.5" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.3.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<metadata>
<id>PeterKottas.DotNetCore.WindowsService</id>
<title>PeterKottas.DotNetCore.WindowsService</title>
<version>1.0.16</version>
<version>1.0.17</version>
<authors>Peter Kottas</authors>
<description>Easiest to use library that allows one to host .net core as windows services there is.</description>
<summary>.NET Core Windows service</summary>
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ private static string GetServiceCommand(List<string> extraArguments)
{
var appPath = Path.Combine(PlatformServices.Default.Application.ApplicationBasePath,
PlatformServices.Default.Application.ApplicationName + ".dll");
host = string.Format("{0} {1}", host, appPath);
host = string.Format("{0} \"{1}\"", host, appPath);
}
if (!host.EndsWith("dotnet.exe", StringComparison.OrdinalIgnoreCase))
{
Expand Down
22 changes: 0 additions & 22 deletions Source/PeterKottas.DotNetCore.WindowsService/project.json

This file was deleted.

0 comments on commit e883665

Please sign in to comment.