-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update to multi target .NET Standard and .NET Framework 4.6
Updated to SDK style csproj format. Updated NuGet packages to latest versions. Updated NuGet and GitHub auth tokens. Removed sandcastle project and replaced with InheritdocInliner task. Removed GitVersion from appveyor and added GitVersionTask as PackageReference. Removed artifact creation. Moved unit test build server commands to MSBuild task. Update .gitignore +semver: patch
- Loading branch information
1 parent
d3964f2
commit 492cb97
Showing
72 changed files
with
422 additions
and
1,282 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,5 @@ | ||
StyleCop.Cache | ||
/packages | ||
/.vs | ||
*.csproj.user | ||
bin | ||
obj | ||
/OpenCover | ||
/tools/coverage | ||
/tools/coverage.xml | ||
/tools/artifact | ||
/docs/Natsnudasoft/Help | ||
/tools/NatsnudaLibrary_Release_Any_CPU.zip | ||
/coverage |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
<Project> | ||
<PropertyGroup> | ||
<LangVersion>latest</LangVersion> | ||
<NeutralLanguage>en-GB</NeutralLanguage> | ||
<Authors>Adrian John Dunstan</Authors> | ||
<Company>Natsnudasoft</Company> | ||
<Copyright>Copyright © Adrian John Dunstan 2019</Copyright> | ||
<Product>NatsnudaLibrary</Product> | ||
</PropertyGroup> | ||
<PropertyGroup Condition="'$(Configuration)'=='Debug'"> | ||
<DefineConstants>DEBUG;TRACE</DefineConstants> | ||
</PropertyGroup> | ||
<PropertyGroup Condition="'$(Configuration)'=='Release'"> | ||
<DefineConstants>TRACE</DefineConstants> | ||
</PropertyGroup> | ||
<PropertyGroup Condition="'$(APPVEYOR)' == 'True'"> | ||
<ReportUnitTests>True</ReportUnitTests> | ||
</PropertyGroup> | ||
<PropertyGroup Condition="'$(APPVEYOR)' == 'True' And '$(APPVEYOR_PULL_REQUEST_NUMBER)' == ''"> | ||
<DefineConstants>$(DefineConstants);StrongNameSign</DefineConstants> | ||
<StrongNameSign>True</StrongNameSign> | ||
</PropertyGroup> | ||
<PropertyGroup Condition="'$(StrongNameSign)' == 'True'"> | ||
<SignAssembly>true</SignAssembly> | ||
<AssemblyOriginatorKeyFile>$(SolutionDir)Natsnudasoft.snk</AssemblyOriginatorKeyFile> | ||
</PropertyGroup> | ||
</Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
<Project> | ||
<Target Name="RunReportUnitTests" AfterTargets="Build" Condition="'$(TargetFramework)' != ''"> | ||
<!-- Currently we only run reports on net46 framework, however these mappings exist for future changes --> | ||
<ItemGroup> | ||
<TestToolMappings Include="netcoreapp2.2"> | ||
<Runner>netcoreapp2.0\xunit.console.dll</Runner> | ||
<ReportGenerator>netcoreapp2.0\ReportGenerator.dll</ReportGenerator> | ||
<Coveralls_io>coveralls.net.exe</Coveralls_io> | ||
</TestToolMappings> | ||
<TestToolMappings Include="net46"> | ||
<Runner>net46\xunit.console.exe</Runner> | ||
<ReportGenerator>net47\ReportGenerator.exe</ReportGenerator> | ||
<Coveralls_io>coveralls.net.exe</Coveralls_io> | ||
</TestToolMappings> | ||
</ItemGroup> | ||
<Exec | ||
Command='"$(PkgOpenCover)\tools\OpenCover.Console.exe" -register:user "-filter:+[*]* -[*Tests]* -[xunit.*]*" -target:"$(Pkgxunit_runner_console)\tools\%(TestToolMappings.Runner)" -targetargs:"\"$(OutputPath)Natsnudasoft.NatsnudasoftTests.dll\" -noshadow" -excludebyattribute:*.ExcludeFromCodeCoverage*;*.CompilerGenerated* -excludebyfile:*Designer.cs -output:$(IntermediateOutputPath)coverage.xml' | ||
Condition="'$(TargetFramework)' == 'net46' And '%(TestToolMappings.Identity)' == '$(TargetFramework)'" /> | ||
<Exec | ||
Command='"$(PkgReportGenerator)\tools\%(TestToolMappings.ReportGenerator)" -reports:$(IntermediateOutputPath)coverage.xml -targetdir:..\..\..\coverage\$(TargetFramework)' | ||
Condition="'$(APPVEYOR)' != 'True' And '$(TargetFramework)' == 'net46' And '%(TestToolMappings.Identity)' == '$(TargetFramework)'" /> | ||
<Exec | ||
Command='"$(Pkgcoveralls_io)\tools\%(TestToolMappings.Coveralls_io)" --opencover $(IntermediateOutputPath)coverage.xml' | ||
Condition="'$(APPVEYOR)' == 'True' And '$(TargetFramework)' == 'net46' And '%(TestToolMappings.Identity)' == '$(TargetFramework)'" /> | ||
</Target> | ||
</Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,91 +1,40 @@ | ||
- | ||
branches: | ||
only: | ||
- master | ||
environment: | ||
COVERALLS_REPO_TOKEN: | ||
secure: +hgrWh6vwfA7rQRwEGfD0od5TBGW/jPEyGwy2jlBM4vZrtjNwnwaa9IzCrig5A+6 | ||
STRONG_NAME_SECRET: | ||
secure: 4W8bFbUP7bJsxCqGF6+xfy7kCUjQscJcrGmjegVxxBs= | ||
image: Visual Studio 2017 | ||
configuration: Release | ||
platform: Any CPU | ||
install: | ||
- choco install gitversion.portable -y | ||
- choco install html-help-workshop -y | ||
- nuget install secure-file -ExcludeVersion | ||
- IF "%APPVEYOR_PULL_REQUEST_NUMBER%" == "" secure-file\tools\secure-file -decrypt Natsnudasoft.snk.enc -secret %STRONG_NAME_SECRET% | ||
before_build: | ||
- nuget restore | ||
- gitversion /l console /output buildserver /updateassemblyinfo AssemblyInfoCommon.cs /b %APPVEYOR_REPO_BRANCH% | ||
build: | ||
project: Natsnudasoft.sln | ||
verbosity: minimal | ||
publish_nuget: true | ||
publish_nuget_symbols: true | ||
include_nuget_references: true | ||
after_build: | ||
- call tools\prepare-artifacts.bat | ||
test: | ||
assemblies: test\unit\NatsnudasoftTests\bin\Release\NatsnudasoftTests.dll | ||
after_test: | ||
- call tools\run-test-report.bat buildserver | ||
cache: | ||
- packages -> **\packages.config | ||
- C:\ProgramData\chocolatey\bin -> appveyor.yml | ||
- C:\ProgramData\chocolatey\lib -> appveyor.yml | ||
artifacts: | ||
- path: NatsnudaLibrary_Release_Any_CPU.zip | ||
name: NatsnudaLibrary_Release_Any_CPU | ||
deploy: | ||
- provider: GitHub | ||
tag: $(APPVEYOR_REPO_TAG_NAME) | ||
release: 'NatsnudaLibrary $(APPVEYOR_REPO_TAG_NAME)' | ||
description: '' | ||
auth_token: | ||
secure: Btb4eq03u8e4+k4WUyv4mWf0kfmzuxSCRo6u1nfOCtxlr4hrdpB5af5tVpt5q+1q | ||
artifact: NatsnudaLibrary_Release_Any_CPU | ||
draft: false | ||
prerelease: false | ||
on: | ||
appveyor_repo_tag: true | ||
- provider: NuGet | ||
api_key: | ||
secure: F2PKDPVrMV/KTcJ6b3U0ADkG/naA2h8TnZySyuEAUAYSHbLKfUdue+SvqhZavPrp | ||
skip_symbols: true | ||
artifact: /.*\.nupkg/ | ||
on: | ||
appveyor_repo_tag: true | ||
- | ||
environment: | ||
COVERALLS_REPO_TOKEN: | ||
secure: +hgrWh6vwfA7rQRwEGfD0od5TBGW/jPEyGwy2jlBM4vZrtjNwnwaa9IzCrig5A+6 | ||
STRONG_NAME_SECRET: | ||
secure: 4W8bFbUP7bJsxCqGF6+xfy7kCUjQscJcrGmjegVxxBs= | ||
image: Visual Studio 2017 | ||
configuration: Release | ||
platform: Any CPU | ||
install: | ||
- choco install gitversion.portable -y | ||
- choco install html-help-workshop -y | ||
- nuget install secure-file -ExcludeVersion | ||
- IF "%APPVEYOR_PULL_REQUEST_NUMBER%" == "" secure-file\tools\secure-file -decrypt Natsnudasoft.snk.enc -secret %STRONG_NAME_SECRET% | ||
before_build: | ||
- nuget restore | ||
- gitversion /l console /output buildserver /updateassemblyinfo AssemblyInfoCommon.cs /b %APPVEYOR_REPO_BRANCH% | ||
build: | ||
project: Natsnudasoft.sln | ||
verbosity: minimal | ||
after_build: | ||
- call tools\prepare-artifacts.bat | ||
test: | ||
assemblies: test\unit\NatsnudasoftTests\bin\Release\NatsnudasoftTests.dll | ||
after_test: | ||
- call tools\run-test-report.bat buildserver | ||
cache: | ||
- packages -> **\packages.config | ||
- C:\ProgramData\chocolatey\bin -> appveyor.yml | ||
- C:\ProgramData\chocolatey\lib -> appveyor.yml | ||
artifacts: | ||
- path: NatsnudaLibrary_Release_Any_CPU.zip | ||
name: NatsnudaLibrary_Release_Any_CPU | ||
environment: | ||
COVERALLS_REPO_TOKEN: | ||
secure: +hgrWh6vwfA7rQRwEGfD0od5TBGW/jPEyGwy2jlBM4vZrtjNwnwaa9IzCrig5A+6 | ||
STRONG_NAME_SECRET: | ||
secure: 4W8bFbUP7bJsxCqGF6+xfy7kCUjQscJcrGmjegVxxBs= | ||
image: Visual Studio 2017 | ||
configuration: Release | ||
platform: Any CPU | ||
install: | ||
- IF "%APPVEYOR_PULL_REQUEST_NUMBER%" == "" nuget install secure-file -ExcludeVersion | ||
- IF "%APPVEYOR_PULL_REQUEST_NUMBER%" == "" secure-file\tools\secure-file -decrypt Natsnudasoft.snk.enc -secret %STRONG_NAME_SECRET% | ||
before_build: | ||
- nuget restore | ||
build: | ||
project: Natsnudasoft.sln | ||
verbosity: minimal | ||
test: | ||
assemblies: test\unit\NatsnudasoftTests\bin\Release\**\NatsnudasoftTests.dll | ||
cache: | ||
- packages -> **\packages.config | ||
- C:\ProgramData\chocolatey\bin -> appveyor.yml | ||
- C:\ProgramData\chocolatey\lib -> appveyor.yml | ||
deploy: | ||
- provider: GitHub | ||
tag: $(APPVEYOR_REPO_TAG_NAME) | ||
release: 'NatsnudaLibrary $(APPVEYOR_REPO_TAG_NAME)' | ||
description: '' | ||
auth_token: | ||
secure: winth2ckr0q/1fONK0Nz7MixzIikq4sYbi/uKfJ97WYgL6rKwI/TT9PNHXcX2pFF | ||
draft: false | ||
prerelease: false | ||
on: | ||
appveyor_repo_tag: true | ||
- provider: NuGet | ||
api_key: | ||
secure: IL1Xdk/t8SL1Dsjfw+pzzSjR7c3qBeydU+7ey4ObYVDaoHNUv+JDxrnxQZ8Im5+q | ||
skip_symbols: true | ||
artifact: /.*\.nupkg/ | ||
on: | ||
appveyor_repo_tag: true |
33 changes: 0 additions & 33 deletions
33
docs/Natsnudasoft/Content/VersionHistory/VersionHistory.aml
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.