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

Move to .NET Standard 2.0 #307

Merged
merged 3 commits into from
Jan 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
272 changes: 0 additions & 272 deletions .paket/Paket.Restore.targets

This file was deleted.

Binary file removed .paket/paket.bootstrapper.exe
Binary file not shown.
44 changes: 0 additions & 44 deletions CommandLine.nuspec

This file was deleted.

23 changes: 5 additions & 18 deletions CommandLine.sln
Original file line number Diff line number Diff line change
@@ -1,26 +1,10 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio 15
VisualStudioVersion = 15.0.27703.2042
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandLine", "src\CommandLine\CommandLine.csproj", "{E1BD3C65-49C3-49E7-BABA-C60980CB3F20}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".Welcome", ".Welcome", "{D9C1F005-94A7-4A2A-81F3-9C053D5A6AEC}"
ProjectSection(SolutionItems) = preProject
License.md = License.md
README.md = README.md
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FSharp", "FSharp", "{751E6303-1623-4418-B298-4FF97DA5C86E}"
ProjectSection(SolutionItems) = preProject
demo\fsharp-demo.fsx = demo\fsharp-demo.fsx
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A6C99AE7-2FE1-4393-9281-7BFCF46A6F53}"
ProjectSection(SolutionItems) = preProject
build.fsx = build.fsx
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandLine.Tests", "tests\CommandLine.Tests\CommandLine.Tests.csproj", "{0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E}"
EndProject
Global
Expand All @@ -41,6 +25,9 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {5B5A476C-82FB-49FB-B592-5224D9005186}
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = src\CommandLine\CommandLine.csproj
EndGlobalSection
Expand Down
4 changes: 0 additions & 4 deletions CommandLine.sln.DotSettings

This file was deleted.

50 changes: 0 additions & 50 deletions Commandline.FSharp.nuspec

This file was deleted.

39 changes: 7 additions & 32 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
#version should be changed with any pull requests
version: 2.2.{build}
version: 2.3.{build}

clone_depth: 1
pull_requests:
do_not_increment_build_number: true

#cache:
#- packages -> paket.dependencies
#- paket-files > paket.dependencies

init:
- ps: |
git config --global core.autocrlf input
Expand All @@ -24,43 +20,22 @@ init:
Update-AppveyorBuild -Version "$ver-$commit"
}

#version patching
assembly_info:
file: src\SharedAssemblyInfo.cs
patch: true
assembly_version: '{version}'
assembly_file_version: '{version}'
assembly_informational_version: $(APPVEYOR_BUILD_VERSION)
dotnet_csproj:
patch: true
file: '**\*.csproj'
version: '{version}'
package_version: '{version}'
assembly_version: '{version}'
file_version: '{version}'
informational_version: '{version}'


environment:
matrix:
- BUILD_TARGET: base
NUSPEC_FILE: CommandLine
- BUILD_TARGET: fsharp
NUSPEC_FILE: CommandLine.FSharp

build_script:
- cmd: build.cmd %BUILD_TARGET%
- cmd: dotnet build src/CommandLine/ -c Release --version-suffix %APPVEYOR_BUILD_VERSION% /p:BuildTarget=%BUILD_TARGET%

after_build:
- ps: |
powershell get-childitem Release\* -include *.dll | foreach-object { "{0}`t{1}" -f $_.Path, [System.Diagnostics.FileVersionInfo]::GetVersionInfo($_).FileVersion }

.\build-nuget-pack.cmd $env:BUILD_TARGET $env:NUSPEC_FILE
test_script:
- cmd: dotnet test tests/CommandLine.Tests/ /p:BuildTarget=%BUILD_TARGET%

test: auto
after_test:
- cmd: dotnet pack src/CommandLine/ -c Release --version-suffix %APPVEYOR_BUILD_VERSION% /p:BuildTarget=%BUILD_TARGET%

artifacts:
- path: 'Release/**/*.nupkg'
- path: 'src/CommandLine/bin/Release/*.nupkg'
name: NugetPackages

on_failure:
Expand Down
19 changes: 0 additions & 19 deletions build-nuget-pack.cmd

This file was deleted.

49 changes: 0 additions & 49 deletions build.cmd

This file was deleted.

47 changes: 0 additions & 47 deletions build.fsx

This file was deleted.

35 changes: 0 additions & 35 deletions build.sh

This file was deleted.

9 changes: 0 additions & 9 deletions global.json

This file was deleted.

14 changes: 0 additions & 14 deletions paket.dependencies

This file was deleted.

Loading