Skip to content

Commit

Permalink
Merge pull request #254 from ermshiperete/master
Browse files Browse the repository at this point in the history
Merge feature/nuget into master
  • Loading branch information
ermshiperete committed May 17, 2021
2 parents 97a15e8 + a0bdff0 commit df1efd6
Show file tree
Hide file tree
Showing 189 changed files with 3,069 additions and 8,524 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ indent_style = tab
tab_width = 4

# Settings Visual Studio uses for the generated files
[*.{csproj,resx,settings,vcxproj*,vdproj,xml}]
[*.{csproj,resx,settings,vcxproj*,vdproj,xml,yml,md}]
indent_style = space
indent_size = 2

Expand Down
3 changes: 2 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@
*.patch -whitespace
*.svg -whitespace
*.xml -whitespace
changelog -whitespace
*.yml -whitespace
CHANGELOG.md -whitespace
10 changes: 5 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ CopyToWeSayDev.bat
lib/Palaso.TestUtilities.pdb
*~
*.pidb
Mercurial/*
mercurial/*
Mercurial/
mercurial/
*ReSharper*
build/old
lib/$(Configuration)
Expand All @@ -27,9 +27,7 @@ src/Chorus.Tests/bin/*
src/ChorusMerge.Tests/bin/*
src/SampleApp/bin/*
CopyTo Dev WeSay.bat
MercurialExtensions/fixutf8/*.pyc
MercurialExtensions/fixutf8/cpmap.pyo
MercurialExtensions/fixutf8/cpmap.py
MercurialExtensions/
test-results
*.mdb
src/LibChorusTests/test-results/LibChorus.Tests.csproj.test-cache
Expand All @@ -39,5 +37,7 @@ L10NSharp.dll
lib/Chorus_Help.chm
packages/
.idea/
.vs/
riderModule.iml
src/LibChorus/icu4c.readme.txt
*.files
5 changes: 0 additions & 5 deletions .nuget/packages.config

This file was deleted.

29 changes: 29 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Change Log

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

<!-- Available types of changes:
### Added
### Changed
### Fixed
### Deprecated
### Removed
### Security
-->

## [Unreleased]

## [4.0.0] - 2021-04-30

### Changed

- Create nuget packages

## [3.0.0] - non-nuget version

[Unreleased]: https://github.com/sillsdev/libpalaso/compare/v4.0.0...master

[4.0.0]: https://github.com/sillsdev/libpalaso/compare/v3.0.0...v4.0.0
247 changes: 28 additions & 219 deletions Chorus.sln

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target Name="CopyPackage" AfterTargets="Pack" Condition="'$(LOCAL_NUGET_REPO)'!='' AND '$(IsPackable)'=='true'">
<Copy SourceFiles="$(PackageOutputPath)/$(PackageId).$(PackageVersion).nupkg"
DestinationFolder="$(LOCAL_NUGET_REPO)"/>
</Target>
</Project>
22 changes: 22 additions & 0 deletions GitVersion.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
assembly-versioning-scheme: MajorMinor
assembly-file-versioning-format: '{Major}.{Minor}.{Patch}.{env:GITVERSION_BUILD_NUMBER ?? 0}'
mode: ContinuousDeployment
branches:
master:
tag: beta
regex: (origin/)?master
hotfix:
tag: beta
regex: (origin/)?hotfix[/-]
increment: Patch
prevent-increment-of-merged-branch-version: false
track-merge-target: false
tracks-release-branches: false
is-release-branch: false
pull-request:
mode: ContinuousDeployment
tag: PR
feature:
regex: feature[/-]
mode: ContinuousDeployment
tag: alpha
6 changes: 0 additions & 6 deletions MercurialExtensions/.guidsForInstaller.xml

This file was deleted.

1 change: 0 additions & 1 deletion MercurialExtensions/Dummy.txt

This file was deleted.

3 changes: 0 additions & 3 deletions MercurialExtensions/fixutf8/.gitignore

This file was deleted.

37 changes: 0 additions & 37 deletions MercurialExtensions/fixutf8/.guidsForInstaller.xml

This file was deleted.

5 changes: 0 additions & 5 deletions MercurialExtensions/fixutf8/.hg_archival.txt

This file was deleted.

3 changes: 0 additions & 3 deletions MercurialExtensions/fixutf8/.hgignore

This file was deleted.

49 changes: 0 additions & 49 deletions MercurialExtensions/fixutf8/README

This file was deleted.

49 changes: 0 additions & 49 deletions MercurialExtensions/fixutf8/buildcpmap.py

This file was deleted.

Binary file removed MercurialExtensions/fixutf8/cpmap.pyc
Binary file not shown.
Loading

0 comments on commit df1efd6

Please sign in to comment.