This commit is contained in:
Tim Hess 2018-04-02 10:29:20 -05:00
Родитель a9c5e11c68
Коммит 391f7d784e
14 изменённых файлов: 32 добавлений и 339 удалений

Просмотреть файл

@ -6,37 +6,22 @@ branches:
only:
- master
- dev
- /^update[0-9]{3}/
- /^update[0-9]{2}x/
install:
- scripts\appveyor_install.cmd
- git clone https://github.com/SteeltoeOSS/steeltoe-ci.git -v
- ps: steeltoe-ci\scripts\appveyor_install.ps1
test_script:
- scripts\appveyor_tests.cmd
- ps: steeltoe-ci\scripts\appveyor_tests.ps1
build_script:
- scripts\appveyor_build.cmd
- ps: steeltoe-ci\scripts\appveyor_build.ps1
artifacts:
- path: 'src\Steeltoe.Extensions.Configuration.ConfigServerBase\bin\Release\*.nupkg'
- path: 'src\Steeltoe.Extensions.Configuration.ConfigServerCore\bin\Release\*.nupkg'
- path: 'src\Steeltoe.Extensions.Configuration.ConfigServerAutofac\bin\Release\*.nupkg'
- path: 'src\Steeltoe.Extensions.Configuration.CloudFoundryBase\bin\Release\*.nupkg'
- path: 'src\Steeltoe.Extensions.Configuration.CloudFoundryCore\bin\Release\*.nupkg'
- path: 'src\Steeltoe.Extensions.Configuration.CloudFoundryAutofac\bin\Release\*.nupkg'
- path: 'src\Steeltoe.Extensions.Configuration.ConfigServerBase\bin\Debug\*.nupkg'
- path: 'src\Steeltoe.Extensions.Configuration.ConfigServerCore\bin\Debug\*.nupkg'
- path: 'src\Steeltoe.Extensions.Configuration.ConfigServerAutofac\bin\Debug\*.nupkg'
- path: 'src\Steeltoe.Extensions.Configuration.CloudFoundryBase\bin\Debug\*.nupkg'
- path: 'src\Steeltoe.Extensions.Configuration.CloudFoundryCore\bin\Debug\*.nupkg'
- path: 'src\Steeltoe.Extensions.Configuration.CloudFoundryAutofac\bin\Debug\*.nupkg'
- path: '**\*.nupkg'
environment:
ProjectList: Steeltoe.Extensions.Configuration.CloudFoundryBase Steeltoe.Extensions.Configuration.ConfigServerBase Steeltoe.Extensions.Configuration.CloudFoundryCore Steeltoe.Extensions.Configuration.CloudFoundryAutofac Steeltoe.Extensions.Configuration.ConfigServerCore Steeltoe.Extensions.Configuration.ConfigServerAutofac
PackageReferencesToUpdate: SteeltoeConfigVersion
github_access_token:
secure: ko4J3M/czguVI9AbVdkv5qZuj3Wuzts5nkz/6cypneFkQGWJXDs8Akg7xOEMu8qU
deploy:
- provider: NuGet
skip_symbols: false
artifact: /.*\.nupkg/
server: https://www.myget.org/F/steeltoemaster/api/v2/package
symbol_server: https://www.myget.org/F/steeltoemaster/symbols/api/v2/package
api_key:
secure: 246ApObnMYYvzDo9Ki72CxxuKfuoqYbrbUK2HLevGIGHXYY6f0OkAdE3EWCwNJ7g
on:
branch: master
appveyor_repo_tag: false
- provider: NuGet
skip_symbols: false
artifact: /.*\.nupkg/
@ -48,28 +33,28 @@ deploy:
branch: dev
appveyor_repo_tag: false
- provider: NuGet
skip_symbols: true
skip_symbols: false
artifact: /.*\.nupkg/
api_key:
secure: RGkpu8xIMDC75IAd1qPRdueeTaYj+ddW2bNEw8S7e81940ELu+WV04uWAzqV34/C
on:
branch: master
appveyor_repo_tag: true
- provider: NuGet
skip_symbols: true
artifact: /.*\.nupkg/
server: https://www.myget.org/F/steeltoeupdates/api/v2/package
symbol_server: https://www.myget.org/F/steeltoeupdates/symbols/api/v2/package
server: https://www.myget.org/F/steeltoemaster/api/v2/package
symbol_server: https://www.myget.org/F/steeltoemaster/symbols/api/v2/package
api_key:
secure: 246ApObnMYYvzDo9Ki72CxxuKfuoqYbrbUK2HLevGIGHXYY6f0OkAdE3EWCwNJ7g
on:
branch: /^update[0-9]{3}/
branch: master
appveyor_repo_tag: false
- provider: NuGet
skip_symbols: true
artifact: /.*\.nupkg/
server: https://www.myget.org/F/steeltoestaging/api/v2/package
symbol_server: https://www.myget.org/F/steeltoestaging/symbols/api/v2/package
api_key:
secure: RGkpu8xIMDC75IAd1qPRdueeTaYj+ddW2bNEw8S7e81940ELu+WV04uWAzqV34/C
secure: 246ApObnMYYvzDo9Ki72CxxuKfuoqYbrbUK2HLevGIGHXYY6f0OkAdE3EWCwNJ7g
on:
branch: /^update[0-9]{3}/
appveyor_repo_tag: true
branch: /^update[0-9]{2}x/
appveyor_repo_tag: false
after_deploy:
- git config --global credential.helper store
- ps: Add-Content "$env:USERPROFILE\.git-credentials" "https://$($env:github_access_token):x-oauth-basic@github.com`n"
- git config --global user.email "steeltoe@pivotal.io"
- git config --global user.name "SteeltoeCI"
- ps: steeltoe-ci\scripts\update_downstream_props.ps1

Просмотреть файл

@ -1,6 +1,7 @@
language: csharp
dist: trusty
env:
STEELTOE_VERSION: 2.1.0
global:
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
- DOTNET_CLI_TELEMETRY_OPTOUT: 1
@ -14,10 +15,11 @@ branches:
only:
- master
- dev
- /^update[0-9]{3}/
- /^update[0-9]{2}x/
script:
- ./scripts/travis_install.sh
- ./scripts/travis_build.sh
- ./scripts/travis_test.sh
- ./steeltoe-ci/scripts/travis_install.sh
- ./steeltoe-ci/scripts/travis_build.sh
- ./steeltoe-ci/scripts/travis_test.sh
before_install:
- git clone https://github.com/SteeltoeOSS/steeltoe-ci.git -v
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then ulimit -n 1024; fi

Просмотреть файл

@ -9,26 +9,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{17EC73D7-8
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{2D89EFD8-0718-443C-B615-AF6C4D6DFB8D}"
ProjectSection(SolutionItems) = preProject
config\nuget-dev.config = config\nuget-dev.config
config\nuget-master.config = config\nuget-master.config
config\nuget-update.config = config\nuget-update.config
config\nuget.config = config\nuget.config
config\versions-dev.props = config\versions-dev.props
config\versions-master.props = config\versions-master.props
config\versions-update.props = config\versions-update.props
config\versions.props = config\versions.props
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{A2BB79F8-B551-4385-9280-9396064C82C2}"
ProjectSection(SolutionItems) = preProject
scripts\appveyor_build.cmd = scripts\appveyor_build.cmd
scripts\appveyor_install.cmd = scripts\appveyor_install.cmd
scripts\appveyor_tests.cmd = scripts\appveyor_tests.cmd
scripts\travis_build.sh = scripts\travis_build.sh
scripts\travis_install.sh = scripts\travis_install.sh
scripts\travis_test.sh = scripts\travis_test.sh
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Extensions.Configuration.CloudFoundryAutofac", "src\Steeltoe.Extensions.Configuration.CloudFoundryAutofac\Steeltoe.Extensions.Configuration.CloudFoundryAutofac.csproj", "{B5189734-AA9B-4B98-ADBE-16EF97F0C12D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Extensions.Configuration.CloudFoundryCore", "src\Steeltoe.Extensions.Configuration.CloudFoundryCore\Steeltoe.Extensions.Configuration.CloudFoundryCore.csproj", "{E65847A5-6D5C-4510-AFF6-D12FD3146555}"

Просмотреть файл

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="SteeltoeDev" value="https://www.myget.org/F/steeltoedev/api/v3/index.json" />
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>

Просмотреть файл

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="SteeltoeMaster" value="https://www.myget.org/F/steeltoemaster/api/v3/index.json" />
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>

Просмотреть файл

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="SteeltoeUpdate" value="https://www.myget.org/F/steeltoeupdates/api/v3/index.json" />
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>

Просмотреть файл

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>

Просмотреть файл

@ -1,18 +0,0 @@
<Project>
<PropertyGroup>
<SteeltoeVersion>$(STEELTOE_VERSION)</SteeltoeVersion>
<SteeltoeVersionSuffix>$(STEELTOE_DASH_VERSION_SUFFIX)</SteeltoeVersionSuffix>
<SteeltoeCommonVersion>2.0.0-update200-00002</SteeltoeCommonVersion>
<AspNetCoreVersion>2.0.0</AspNetCoreVersion>
<AspNetCoreTestVersion>2.0.0</AspNetCoreTestVersion>
<AspNetCoreMvcTestVersion>2.0.0</AspNetCoreMvcTestVersion>
<AutofacVersion>4.6.1</AutofacVersion>
<HttpVersion>4.3.3</HttpVersion>
<CoreFxVersion>4.4.0</CoreFxVersion>
<StyleCopVersion>1.0.2</StyleCopVersion>
<JsonNetVersion>10.0.1</JsonNetVersion>
<TestSdkVersion>15.3.0</TestSdkVersion>
<XunitVersion>2.3.1</XunitVersion>
<XunitStudioVersion>2.3.1</XunitStudioVersion>
</PropertyGroup>
</Project>

Просмотреть файл

@ -1,81 +0,0 @@
:: @ECHO OFF
:: Build packages
cd src\Steeltoe.Extensions.Configuration.CloudFoundryBase
dotnet restore --configfile ..\..\nuget.config
IF NOT "%APPVEYOR_REPO_TAG_NAME%"=="" (
IF NOT "%STEELTOE_VERSION_SUFFIX%"=="" (
dotnet pack --configuration %BUILD_TYPE% --version-suffix %STEELTOE_VERSION_SUFFIX%
nuget add "bin\%BUILD_TYPE%\Steeltoe.Extensions.Configuration.CloudFoundryBase.%STEELTOE_VERSION%-%STEELTOE_VERSION_SUFFIX%.nupkg" -Source "%USERPROFILE%\localfeed"
) ELSE (
dotnet pack --configuration %BUILD_TYPE%
nuget add "bin\%BUILD_TYPE%\Steeltoe.Extensions.Configuration.CloudFoundryBase.%STEELTOE_VERSION%.nupkg" -Source "%USERPROFILE%\localfeed"
)
)
IF "%APPVEYOR_REPO_TAG_NAME%"=="" (dotnet pack --configuration %BUILD_TYPE% --version-suffix %STEELTOE_VERSION_SUFFIX% --include-symbols --include-source)
IF "%APPVEYOR_REPO_TAG_NAME%"=="" (nuget add bin\%BUILD_TYPE%\Steeltoe.Extensions.Configuration.CloudFoundryBase.%STEELTOE_VERSION%-%STEELTOE_VERSION_SUFFIX%.nupkg -Source %USERPROFILE%\localfeed)
cd ..\..
cd src\Steeltoe.Extensions.Configuration.ConfigServerBase
dotnet restore --configfile ..\..\nuget.config
IF NOT "%APPVEYOR_REPO_TAG_NAME%"=="" (
IF NOT "%STEELTOE_VERSION_SUFFIX%"=="" (
dotnet pack --configuration %BUILD_TYPE% --version-suffix %STEELTOE_VERSION_SUFFIX%
nuget add "bin\%BUILD_TYPE%\Steeltoe.Extensions.Configuration.ConfigServerBase.%STEELTOE_VERSION%-%STEELTOE_VERSION_SUFFIX%.nupkg" -Source "%USERPROFILE%\localfeed"
) ELSE (
dotnet pack --configuration %BUILD_TYPE%
nuget add "bin\%BUILD_TYPE%\Steeltoe.Extensions.Configuration.ConfigServerBase.%STEELTOE_VERSION%.nupkg" -Source "%USERPROFILE%\localfeed"
)
)
IF "%APPVEYOR_REPO_TAG_NAME%"=="" (dotnet pack --configuration %BUILD_TYPE% --version-suffix %STEELTOE_VERSION_SUFFIX% --include-symbols --include-source)
IF "%APPVEYOR_REPO_TAG_NAME%"=="" (nuget add bin\%BUILD_TYPE%\Steeltoe.Extensions.Configuration.ConfigServerBase.%STEELTOE_VERSION%-%STEELTOE_VERSION_SUFFIX%.nupkg -Source %USERPROFILE%\localfeed)
cd ..\..
cd src\Steeltoe.Extensions.Configuration.CloudFoundryCore
dotnet restore --configfile ..\..\nuget.config
IF NOT "%APPVEYOR_REPO_TAG_NAME%"=="" (
IF NOT "%STEELTOE_VERSION_SUFFIX%"=="" (
dotnet pack --configuration %BUILD_TYPE% --version-suffix %STEELTOE_VERSION_SUFFIX%
) ELSE (
dotnet pack --configuration %BUILD_TYPE%
)
)
IF "%APPVEYOR_REPO_TAG_NAME%"=="" (dotnet pack --configuration %BUILD_TYPE% --version-suffix %STEELTOE_VERSION_SUFFIX% --include-symbols --include-source)
cd ..\..
cd src\Steeltoe.Extensions.Configuration.CloudFoundryAutofac
dotnet restore --configfile ..\..\nuget.config
IF NOT "%APPVEYOR_REPO_TAG_NAME%"=="" (
IF NOT "%STEELTOE_VERSION_SUFFIX%"=="" (
dotnet pack --configuration %BUILD_TYPE% --version-suffix %STEELTOE_VERSION_SUFFIX%
) ELSE (
dotnet pack --configuration %BUILD_TYPE%
)
)
IF "%APPVEYOR_REPO_TAG_NAME%"=="" (dotnet pack --configuration %BUILD_TYPE% --version-suffix %STEELTOE_VERSION_SUFFIX% --include-symbols --include-source)
cd ..\..
cd src\Steeltoe.Extensions.Configuration.ConfigServerCore
dotnet restore --configfile ..\..\nuget.config
IF NOT "%APPVEYOR_REPO_TAG_NAME%"=="" (
IF NOT "%STEELTOE_VERSION_SUFFIX%"=="" (
dotnet pack --configuration %BUILD_TYPE% --version-suffix %STEELTOE_VERSION_SUFFIX%
) ELSE (
dotnet pack --configuration %BUILD_TYPE%
)
)
IF "%APPVEYOR_REPO_TAG_NAME%"=="" (dotnet pack --configuration %BUILD_TYPE% --version-suffix %STEELTOE_VERSION_SUFFIX% --include-symbols --include-source)
cd ..\..
cd src\Steeltoe.Extensions.Configuration.ConfigServerAutofac
dotnet restore --configfile ..\..\nuget.config
IF NOT "%APPVEYOR_REPO_TAG_NAME%"=="" (
IF NOT "%STEELTOE_VERSION_SUFFIX%"=="" (
dotnet pack --configuration %BUILD_TYPE% --version-suffix %STEELTOE_VERSION_SUFFIX%
) ELSE (
dotnet pack --configuration %BUILD_TYPE%
)
)
IF "%APPVEYOR_REPO_TAG_NAME%"=="" (dotnet pack --configuration %BUILD_TYPE% --version-suffix %STEELTOE_VERSION_SUFFIX% --include-symbols --include-source)
cd ..\..

Просмотреть файл

@ -1,28 +0,0 @@
@ECHO OFF
:: Output dotnet info
dotnet --info
SET CI_BUILD=%APPVEYOR%
SET number=00000%APPVEYOR_BUILD_NUMBER%
SET STEELTOE_VERSION=2.1.0
SET STEELTOE_VERSION_SUFFIX=%APPVEYOR_REPO_BRANCH%-%number:~-5%
IF NOT "%APPVEYOR_REPO_TAG_NAME%"=="" SET STEELTOE_VERSION_SUFFIX=%APPVEYOR_REPO_TAG_NAME:~6,5%
IF NOT "%STEELTOE_VERSION_SUFFIX%"=="" (
SET STEELTOE_VERSION_SUFFIX=%STEELTOE_VERSION_SUFFIX: =%
SET STEELTOE_DASH_VERSION_SUFFIX=-%STEELTOE_VERSION_SUFFIX%
) ELSE (
SET STEELTOE_DASH_VERSION_SUFFIX=
)
echo "Version Suffix:" %STEELTOE_VERSION_SUFFIX%
SET BUILD_TYPE=Release
IF "%APPVEYOR_REPO_BRANCH%"=="master" COPY config\nuget-master.config .\nuget.config
IF "%APPVEYOR_REPO_BRANCH%"=="dev" COPY config\nuget-dev.config .\nuget.config
IF "%APPVEYOR_REPO_BRANCH:~0,3%"=="upd" COPY config\nuget-update.config .\nuget.config
IF NOT "%APPVEYOR_REPO_TAG_NAME%"=="" COPY config\nuget.config .\nuget.config
IF "%APPVEYOR_REPO_BRANCH%"=="master" COPY config\versions-master.props .\versions.props
IF "%APPVEYOR_REPO_BRANCH%"=="dev" COPY config\versions-dev.props .\versions.props
IF "%APPVEYOR_REPO_BRANCH:~0,3%"=="upd" COPY config\versions-update.props .\versions.props
IF NOT "%APPVEYOR_REPO_TAG_NAME%"=="" COPY config\versions.props .\versions.props
IF "%APPVEYOR_REPO_BRANCH%"=="dev" SET BUILD_TYPE=Debug
mkdir %USERPROFILE%\localfeed
nuget sources add -Name localfeed -Source %USERPROFILE%\localfeed -ConfigFile .\nuget.config

Просмотреть файл

@ -1,45 +0,0 @@
@ECHO OFF
:: Run unit tests
cd test\Steeltoe.Extensions.Configuration.CloudFoundryBase.Test
dotnet restore --configfile ..\..\nuget.config
dotnet xunit -verbose
if not "%errorlevel%"=="0" goto failure
cd ..\..
cd test\Steeltoe.Extensions.Configuration.CloudFoundryCore.Test
dotnet restore --configfile ..\..\nuget.config
dotnet xunit -verbose
if not "%errorlevel%"=="0" goto failure
cd ..\..
cd test\Steeltoe.Extensions.Configuration.CloudFoundryAutofac.Test
dotnet restore --configfile ..\..\nuget.config
dotnet xunit -verbose
if not "%errorlevel%"=="0" goto failure
cd ..\..
cd test\Steeltoe.Extensions.Configuration.ConfigServerBase.Test
dotnet restore --configfile ..\..\nuget.config
dotnet xunit -verbose
if not "%errorlevel%"=="0" goto failure
cd ..\..
cd test\Steeltoe.Extensions.Configuration.ConfigServerCore.Test
dotnet restore --configfile ..\..\nuget.config
dotnet xunit -verbose
if not "%errorlevel%"=="0" goto failure
cd ..\..
cd test\Steeltoe.Extensions.Configuration.ConfigServerAutofac.Test
dotnet restore --configfile ..\..\nuget.config
dotnet xunit -verbose
if not "%errorlevel%"=="0" goto failure
cd ..\..
echo Unit Tests Pass
goto success
:failure
echo Unit Tests Failure
exit -1
:success

Просмотреть файл

@ -1,28 +0,0 @@
#!/bin/bash
echo Code is built in Unit Tests
cd src/Steeltoe.Extensions.Configuration.CloudFoundryBase
dotnet restore --configfile ../../nuget.config
cd ../..
cd src/Steeltoe.Extensions.Configuration.CloudFoundryCore
dotnet restore --configfile ../../nuget.config
cd ../..
cd src/Steeltoe.Extensions.Configuration.CloudFoundryAutofac
dotnet restore --configfile ../../nuget.config
cd ../..
cd src/Steeltoe.Extensions.Configuration.ConfigServerBase
dotnet restore --configfile ../../nuget.config
cd ../..
cd src/Steeltoe.Extensions.Configuration.ConfigServerCore
dotnet restore --configfile ../../nuget.config
cd ../..
cd src/Steeltoe.Extensions.Configuration.ConfigServerAutofac
dotnet restore --configfile ../../nuget.config
cd ../..

Просмотреть файл

@ -1,14 +0,0 @@
#!/bin/bash
dotnet --info
export CI_BUILD=True
export STEELTOE_VERSION=2.1.0
if [[ "$TRAVIS_BRANCH" == "master" ]]; then cp config/nuget-master.config ./nuget.config ; fi
if [[ "$TRAVIS_BRANCH" == "dev" ]]; then cp config/nuget-dev.config ./nuget.config ; fi
if [[ "${TRAVIS_BRANCH:0:3}" == "upd" ]]; then cp config/nuget-update.config ./nuget.config ; fi
if [[ "$TRAVIS_TAG" != "" ]]; then cp config/nuget.config ./nuget.config ; fi
if [[ "$TRAVIS_BRANCH" == "master" ]]; then cp config/versions-master.props ./versions.props ; fi
if [[ "$TRAVIS_BRANCH" == "dev" ]]; then cp config/versions-dev.props ./versions.props ; fi
if [[ "${TRAVIS_BRANCH:0:3}" == "upd" ]]; then cp config/versions-update.props ./versions.props ; fi
if [[ "$TRAVIS_TAG" != "" ]]; then cp config/versions.props ./versions.props ; fi

Просмотреть файл

@ -1,38 +0,0 @@
#!/bin/bash
# Run unit tests
cd test/Steeltoe.Extensions.Configuration.CloudFoundryBase.Test
dotnet restore --configfile ../../nuget.config
dotnet xunit -verbose -framework netcoreapp2.0
if [[ $? != 0 ]]; then exit 1 ; fi
cd ../..
cd test/Steeltoe.Extensions.Configuration.CloudFoundryCore.Test
dotnet restore --configfile ../../nuget.config
dotnet xunit -verbose -framework netcoreapp2.0
if [[ $? != 0 ]]; then exit 1 ; fi
cd ../..
cd test/Steeltoe.Extensions.Configuration.CloudFoundryAutofac.Test
dotnet restore --configfile ../../nuget.config
dotnet xunit -verbose -framework netcoreapp2.0
if [[ $? != 0 ]]; then exit 1 ; fi
cd ../..
cd test/Steeltoe.Extensions.Configuration.ConfigServerBase.Test
dotnet restore --configfile ../../nuget.config
dotnet xunit -verbose -framework netcoreapp2.0
if [[ $? != 0 ]]; then exit 1 ; fi
cd ../..
cd test/Steeltoe.Extensions.Configuration.ConfigServerCore.Test
dotnet restore --configfile ../../nuget.config
dotnet xunit -verbose -framework netcoreapp2.0
if [[ $? != 0 ]]; then exit 1 ; fi
cd ../..
cd test/Steeltoe.Extensions.Configuration.ConfigServerAutofac.Test
dotnet restore --configfile ../../nuget.config
dotnet xunit -verbose -framework netcoreapp2.0
if [[ $? != 0 ]]; then exit 1 ; fi
cd ../..