Merge remote-tracking branch 'origin/master'

# Conflicts:
#	buildReleaseNuGetPackages.cmd
This commit is contained in:
Robert Muehsig
2017-10-29 23:13:45 +01:00
3 changed files with 18 additions and 5 deletions

View File

@@ -1,3 +1,16 @@
# not release
ElectronNET.CLI:
* nuget packages are now release bits and have the correct assembly verion
# 0.0.5
ElectronNET.API:
* The last nuget package didn't contain the actual webpreferences settings with defaults - hopefully now.
# 0.0.4
ElectronNET.CLI:

View File

@@ -1,4 +1,4 @@
[![Electron.NET Logo](https://github.com/GregorBiswanger/Electron.NET/blob/master/assets/images/electron.net-logo.png)](https://github.com/GregorBiswanger/Electron.NET)
[![Electron.NET Logo](https://github.com/ElectronNET/Electron.NET/blob/master/assets/images/electron.net-logo.png)](https://github.com/ElectronNET/Electron.NET)
AppVeyor (Win/Linux): [![Build status](https://ci.appveyor.com/api/projects/status/q95h4xt14papwi05/branch/master?svg=true)](https://ci.appveyor.com/project/robertmuehsig/electron-net/branch/master)

View File

@@ -2,11 +2,11 @@ echo "Start building Electron.NET dev stack..."
echo "Restore & Build API"
cd ElectronNet.API
dotnet restore
dotnet build --configuration Release --force /property:Version=0.0.4
dotnet pack /p:Version=0.0.4 --configuration Release --force --output "%~dp0artifacts"
dotnet build --configuration Release --force /property:Version=0.0.5
dotnet pack /p:Version=0.0.5 --configuration Release --force --output "%~dp0artifacts"
cd ..
echo "Restore & Build API"
cd ElectronNet.CLI
dotnet restore
dotnet build --configuration Release --force /property:Version=0.0.4
dotnet pack /p:Version=0.0.4 --configuration Release --force --output "%~dp0artifacts"
dotnet build --configuration Release --force /property:Version=0.0.5
dotnet pack /p:Version=0.0.5 --configuration Release --force --output "%~dp0artifacts"