Skip to content

Commit

Permalink
Hotfix - publish trimmed (#348)
Browse files Browse the repository at this point in the history
* Disable publishtrimmed since it breaks things

* bump for v1.11.0

Co-authored-by: James A Sutherland <[email protected]>
  • Loading branch information
rkm and jas88 authored Aug 12, 2020
1 parent c193e7c commit 6aa8eef
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
mkdir -p ./dist
for platform in linux win
do
dotnet publish -p:PublishTrimmed=true -c Release -r $platform-x64 -o $(pwd)/dist/$platform-x64 -nologo -v q
dotnet publish -p:PublishTrimmed=false -c Release -r $platform-x64 -o $(pwd)/dist/$platform-x64 -nologo -v q
done
( cd dist && zip -9r smi-services-win-x64-$TRAVIS_TAG.zip ./win-x64 && tar cf - ./linux-x64 | pigz -3 > smi-services-linux-x64-$TRAVIS_TAG.tar.gz && cd - )
mvn -ntp -q -f src/common/com.smi.microservices.parent/pom.xml install assembly:single@create-deployable -DskipTests
Expand Down
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [Unreleased]

## [1.11.1] - 2020-08-12

- Set PublishTrimmed to false to fix bug with missing assemblies in prod.

## [1.11.0] - 2020-08-06

### Added
Expand Down Expand Up @@ -362,7 +366,8 @@ First stable release after importing the repository from the private [SMIPlugin]
- Anonymous `MappingTableName` must now be fully specified to pass validation (e.g. `mydb.mytbl`). Previously skipping database portion was supported.


[Unreleased]: https://github.com/SMI/SmiServices/compare/v1.11.0...develop
[Unreleased]: https://github.com/SMI/SmiServices/compare/v1.11.1...develop
[1.11.1]: https://github.com/SMI/SmiServices/compare/v1.11.0...v1.11.1
[1.11.0]: https://github.com/SMI/SmiServices/compare/v1.10.0...v1.11.0
[1.10.0]: https://github.com/SMI/SmiServices/compare/v1.9.0...v1.10.0
[1.9.0]: https://github.com/SMI/SmiServices/compare/v1.8.1...v1.9.0
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[![Total alerts](https://img.shields.io/lgtm/alerts/g/SMI/SmiServices.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/SMI/SmiServices/alerts/)
[![Coverage Status](https://coveralls.io/repos/github/SMI/SmiServices/badge.svg)](https://coveralls.io/github/SMI/SmiServices)

Version: `1.11.0`
Version: `1.11.1`

# SMI Services

Expand Down
6 changes: 3 additions & 3 deletions src/SharedAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
[assembly: AssemblyCulture("")]

// These should be overwritten by release builds
[assembly: AssemblyVersion("1.11.0")]
[assembly: AssemblyFileVersion("1.11.0")]
[assembly: AssemblyInformationalVersion("1.11.0")] // This one can have the extra build info after it
[assembly: AssemblyVersion("1.11.1")]
[assembly: AssemblyFileVersion("1.11.1")]
[assembly: AssemblyInformationalVersion("1.11.1")] // This one can have the extra build info after it

0 comments on commit 6aa8eef

Please sign in to comment.