Skip to content

Commit

Permalink
Migrate to SDK-style projects
Browse files Browse the repository at this point in the history
  • Loading branch information
nxtn committed Jan 13, 2020
1 parent 9c9a1d1 commit 9634ddf
Show file tree
Hide file tree
Showing 30 changed files with 127 additions and 1,263 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@ obj
/src/packages/
/winsw_key.snk
/winsw_key.pfx
/src/.vs/winsw/v15/sqlite3/storage.ide
/src/.vs/
/src/Core/WinSWCore/WinSWCore.csproj.DotSettings
/src/.vs/winsw/v15/Server/sqlite3
8 changes: 8 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Project>

<PropertyGroup>
<DebugType>full</DebugType>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)winsw_key.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

</Project>
4 changes: 2 additions & 2 deletions WinSW.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ More info about the wrapper is available in the projects GitHub repository.
</dependencies>
</metadata>
<files>
<file src="src\Core\ServiceWrapper\bin\Release\WinSW.NET2.exe" target="lib\net20-full" />
<file src="src\Core\ServiceWrapper_dotNET4\bin\Release\WinSW.NET4.exe" target="lib\net40-full" />
<file src="src\Core\ServiceWrapper\bin\Release\net20\WinSW.exe" target="lib\net20-full\WinSW.NET2.exe" />
<file src="src\Core\ServiceWrapper\bin\Release\net40\WinSW.exe" target="lib\net40-full\WinSW.NET4.exe" />
<file src="examples\sample-allOptions.xml" target="lib\net20-full\WinSW.NET2.xml" />
<file src="examples\sample-allOptions.xml" target="lib\net40-full\WinSW.NET4.xml" />
</files>
Expand Down
26 changes: 10 additions & 16 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ skip_tags: true
skip_branch_with_pr: true

# Project configuration
image: Visual Studio 2013
image: Visual Studio 2019
platform: Any CPU
configuration: Release

Expand All @@ -16,17 +16,15 @@ nuget:
before_build:
# Check SDKs
- ECHO "Installed SDKs:"
- ps: "ls \"C:/Program Files/Microsoft SDKs/Windows\""
- ps: "ls \"C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\\""
# Generates a temporary SNK. Not for real signing
- cmd: "\"C:/Program Files/Microsoft SDKs/Windows/v7.1/Bin/sn.exe\" -k winsw_key.snk"
- cmd: "\"C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.8 Tools\\sn.exe\" -k winsw_key.snk"

assembly_info:
dotnet_csproj:
patch: true
file: "**\\AssemblyInfo.*"
assembly_version: $(appveyor_build_version)
assembly_file_version: $(appveyor_build_version)
assembly_informational_version: '$(appveyor_build_version)-rc'

file: "**\\*.csproj"
version: $(appveyor_build_version)

build:
parallel: true
project: src\winsw.sln
Expand All @@ -36,20 +34,16 @@ after_build:

test_script:
# Runner for NUnit2
- ps: nunit-console 'src/Test/winswTests/bin/Release/winswTests.dll' 'src/Test/winswTests/bin/Release/SharedDirectoryMapper.dll' 'src/Test/winswTests/bin/Release/RunawayProcessKiller.dll'
- ps: nunit-console 'src/Test/winswTests/bin/Release/net40/winswTests.dll' 'src/Test/winswTests/bin/Release/net40/SharedDirectoryMapper.dll' 'src/Test/winswTests/bin/Release/net40/RunawayProcessKiller.dll'

artifacts:
- path: 'src/Core/ServiceWrapper/bin/Release/WinSW.NET2.exe'
- path: 'src/Core/ServiceWrapper/bin/Release/net20/WinSW.exe'
name: WinSW.NET2.exe
- path: 'src/Core/ServiceWrapper_dotNET4/bin/Release/WinSW.NET4.exe'
- path: 'src/Core/ServiceWrapper/bin/Release/net40/WinSW.exe'
name: WinSW.NET4.exe
- path: 'WinSW.$(appveyor_build_version).nupkg'
name: WinSW.nupkg
- path: 'examples/sample-allOptions.xml'
name: 'sample-allOptions.xml'
- path: 'examples/sample-minimal.xml'
name: 'sample-minimal.xml'




6 changes: 0 additions & 6 deletions src/.nuget/NuGet.Config

This file was deleted.

Binary file removed src/.nuget/NuGet.exe
Binary file not shown.
144 changes: 0 additions & 144 deletions src/.nuget/NuGet.targets

This file was deleted.

4 changes: 0 additions & 4 deletions src/.nuget/packages.config

This file was deleted.

32 changes: 0 additions & 32 deletions src/Core/ServiceWrapper/Properties/AssemblyInfo.cs

This file was deleted.

7 changes: 0 additions & 7 deletions src/Core/ServiceWrapper/packages.config

This file was deleted.

Loading

0 comments on commit 9634ddf

Please sign in to comment.