Skip to content
This repository was archived by the owner on May 17, 2019. It is now read-only.

Commit aecd91d

Browse files
dtillmandtillman
committed
Merge branch 'dev'
2 parents 7355719 + 4f8e7f3 commit aecd91d

33 files changed

+1424
-635
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ env:
55
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
66
- DOTNET_CLI_TELEMETRY_OPTOUT: 1
77
mono: none
8-
dotnet: 2.0.0
8+
dotnet: 2.0.3
99
os:
1010
- linux
1111
- osx
12-
osx_image: xcode8.2
12+
osx_image: xcode8.3
1313
branches:
1414
only:
1515
- master

‎Logging.sln‎

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,44 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26430.16
4+
VisualStudioVersion = 15.0.26730.16
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{26E1A61B-FA79-41BF-9C3B-5A04299F356A}"
77
EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{EEF15943-96DB-44B5-BA4A-1D11171AD74F}"
99
EndProject
10-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Extensions.Logging.CloudFoundry", "src\Steeltoe.Extensions.Logging.CloudFoundry\Steeltoe.Extensions.Logging.CloudFoundry.csproj", "{BCF90E1F-ADD2-42A2-8601-AB7A5C9FAFC4}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Extensions.Logging.DynamicLogger", "src\Steeltoe.Extensions.Logging.DynamicLogger\Steeltoe.Extensions.Logging.DynamicLogger.csproj", "{BCF90E1F-ADD2-42A2-8601-AB7A5C9FAFC4}"
1111
EndProject
12-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Extensions.Logging.CloudFoundry.Test", "test\Steeltoe.Extensions.Logging.CloudFoundry.Test\Steeltoe.Extensions.Logging.CloudFoundry.Test.csproj", "{CBD7C37D-6CDC-4058-9B68-68EDC87837FD}"
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Extensions.Logging.DynamicLogger.Test", "test\Steeltoe.Extensions.Logging.DynamicLogger.Test\Steeltoe.Extensions.Logging.DynamicLogger.Test.csproj", "{CBD7C37D-6CDC-4058-9B68-68EDC87837FD}"
13+
EndProject
14+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{2BFFFBDB-66EE-4F9C-9ABE-DB2A9EE49F12}"
15+
ProjectSection(SolutionItems) = preProject
16+
config\nuget-dev.config = config\nuget-dev.config
17+
config\nuget-master.config = config\nuget-master.config
18+
config\nuget-update.config = config\nuget-update.config
19+
config\nuget.config = config\nuget.config
20+
config\versions-dev.props = config\versions-dev.props
21+
config\versions-master.props = config\versions-master.props
22+
config\versions-update.props = config\versions-update.props
23+
config\versions.props = config\versions.props
24+
EndProjectSection
25+
EndProject
26+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{FCAFA831-BB1D-4674-9BEC-E6A2271E7483}"
27+
ProjectSection(SolutionItems) = preProject
28+
scripts\appveyor_build.cmd = scripts\appveyor_build.cmd
29+
scripts\appveyor_install.cmd = scripts\appveyor_install.cmd
30+
scripts\appveyor_tests.cmd = scripts\appveyor_tests.cmd
31+
scripts\travis_build.sh = scripts\travis_build.sh
32+
scripts\travis_install.sh = scripts\travis_install.sh
33+
scripts\travis_test.sh = scripts\travis_test.sh
34+
EndProjectSection
35+
EndProject
36+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9A1B0D5C-681B-4A1B-8C28-E8AB1936736E}"
37+
ProjectSection(SolutionItems) = preProject
38+
.travis.yml = .travis.yml
39+
appveyor.yml = appveyor.yml
40+
stylecop.json = stylecop.json
41+
EndProjectSection
1342
EndProject
1443
Global
1544
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -33,4 +62,7 @@ Global
3362
{BCF90E1F-ADD2-42A2-8601-AB7A5C9FAFC4} = {26E1A61B-FA79-41BF-9C3B-5A04299F356A}
3463
{CBD7C37D-6CDC-4058-9B68-68EDC87837FD} = {EEF15943-96DB-44B5-BA4A-1D11171AD74F}
3564
EndGlobalSection
65+
GlobalSection(ExtensibilityGlobals) = postSolution
66+
SolutionGuid = {F03D9805-6C7E-411E-A8D5-191ABE8D2F66}
67+
EndGlobalSection
3668
EndGlobal

‎appveyor.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '1.1.0-{branch}-{build}'
1+
version: '2.0.0-{branch}-{build}'
22
init:
33
- git config --global core.autocrlf true
44
image: Visual Studio 2017
@@ -14,8 +14,8 @@ test_script:
1414
build_script:
1515
- scripts\appveyor_build.cmd
1616
artifacts:
17-
- path: 'src\Steeltoe.Extensions.Logging.CloudFoundry\bin\Release\*.nupkg'
18-
- path: 'src\Steeltoe.Extensions.Logging.CloudFoundry\bin\Debug\*.nupkg'
17+
- path: 'src\Steeltoe.Extensions.Logging.DynamicLogger\bin\Release\*.nupkg'
18+
- path: 'src\Steeltoe.Extensions.Logging.DynamicLogger\bin\Debug\*.nupkg'
1919
deploy:
2020
- provider: NuGet
2121
skip_symbols: false

‎config/versions-dev.props‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
<PropertyGroup>
33
<SteeltoeVersion>$(STEELTOE_VERSION)</SteeltoeVersion>
44
<SteeltoeVersionSuffix>$(STEELTOE_DASH_VERSION_SUFFIX)</SteeltoeVersionSuffix>
5-
<AspNetCoreVersion>1.1.0</AspNetCoreVersion>
6-
<AspNetCoreTestVersion>1.1.2</AspNetCoreTestVersion>
7-
<AspNetCoreMvcTestVersion>1.1.3</AspNetCoreMvcTestVersion>
8-
<CoreFxVersion>4.3.0</CoreFxVersion>
9-
<JsonNetVersion>9.0.1</JsonNetVersion>
10-
<TestSdkVersion>15.3.0</TestSdkVersion>
11-
<XunitVersion>2.3.0-beta4-build3742</XunitVersion>
12-
<XunitStudioVersion>2.3.0-beta4-build3742</XunitStudioVersion>
5+
<AspNetCoreVersion>2.0.0</AspNetCoreVersion>
6+
<AspNetCoreTestVersion>2.0.0</AspNetCoreTestVersion>
7+
<AspNetCoreMvcTestVersion>2.0.0</AspNetCoreMvcTestVersion>
8+
<CoreFxVersion>4.4.0</CoreFxVersion>
9+
<StyleCopVersion>1.0.2</StyleCopVersion>
10+
<JsonNetVersion>10.0.3</JsonNetVersion>
11+
<TestSdkVersion>15.5.0</TestSdkVersion>
12+
<XunitVersion>2.3.1</XunitVersion>
13+
<XunitStudioVersion>2.3.1</XunitStudioVersion>
1314
</PropertyGroup>
1415
</Project>

‎config/versions-master.props‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
<PropertyGroup>
33
<SteeltoeVersion>$(STEELTOE_VERSION)</SteeltoeVersion>
44
<SteeltoeVersionSuffix>$(STEELTOE_DASH_VERSION_SUFFIX)</SteeltoeVersionSuffix>
5-
<AspNetCoreVersion>1.1.0</AspNetCoreVersion>
6-
<AspNetCoreTestVersion>1.1.2</AspNetCoreTestVersion>
7-
<AspNetCoreMvcTestVersion>1.1.3</AspNetCoreMvcTestVersion>
8-
<CoreFxVersion>4.3.0</CoreFxVersion>
9-
<JsonNetVersion>9.0.1</JsonNetVersion>
10-
<TestSdkVersion>15.3.0</TestSdkVersion>
11-
<XunitVersion>2.3.0-beta4-build3742</XunitVersion>
12-
<XunitStudioVersion>2.3.0-beta4-build3742</XunitStudioVersion>
5+
<AspNetCoreVersion>2.0.0</AspNetCoreVersion>
6+
<AspNetCoreTestVersion>2.0.0</AspNetCoreTestVersion>
7+
<AspNetCoreMvcTestVersion>2.0.0</AspNetCoreMvcTestVersion>
8+
<CoreFxVersion>4.4.0</CoreFxVersion>
9+
<StyleCopVersion>1.0.2</StyleCopVersion>
10+
<JsonNetVersion>10.0.3</JsonNetVersion>
11+
<TestSdkVersion>15.5.0</TestSdkVersion>
12+
<XunitVersion>2.3.1</XunitVersion>
13+
<XunitStudioVersion>2.3.1</XunitStudioVersion>
1314
</PropertyGroup>
1415
</Project>

‎config/versions-update.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<CoreFxVersion>4.3.0</CoreFxVersion>
99
<JsonNetVersion>9.0.1</JsonNetVersion>
1010
<TestSdkVersion>15.3.0</TestSdkVersion>
11-
<XunitVersion>2.3.0-beta4-build3742</XunitVersion>
12-
<XunitStudioVersion>2.3.0-beta4-build3742</XunitStudioVersion>
11+
<XunitVersion>2.3.1</XunitVersion>
12+
<XunitStudioVersion>2.3.1</XunitStudioVersion>
1313
</PropertyGroup>
1414
</Project>

‎config/versions.props‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
<PropertyGroup>
33
<SteeltoeVersion>$(STEELTOE_VERSION)</SteeltoeVersion>
44
<SteeltoeVersionSuffix>$(STEELTOE_DASH_VERSION_SUFFIX)</SteeltoeVersionSuffix>
5-
<AspNetCoreVersion>1.1.0</AspNetCoreVersion>
6-
<AspNetCoreTestVersion>1.1.2</AspNetCoreTestVersion>
7-
<AspNetCoreMvcTestVersion>1.1.3</AspNetCoreMvcTestVersion>
8-
<CoreFxVersion>4.3.0</CoreFxVersion>
9-
<JsonNetVersion>9.0.1</JsonNetVersion>
10-
<TestSdkVersion>15.3.0</TestSdkVersion>
11-
<XunitVersion>2.3.0-beta4-build3742</XunitVersion>
12-
<XunitStudioVersion>2.3.0-beta4-build3742</XunitStudioVersion>
5+
<AspNetCoreVersion>2.0.0</AspNetCoreVersion>
6+
<AspNetCoreTestVersion>2.0.0</AspNetCoreTestVersion>
7+
<AspNetCoreMvcTestVersion>2.0.0</AspNetCoreMvcTestVersion>
8+
<CoreFxVersion>4.4.0</CoreFxVersion>
9+
<StyleCopVersion>1.0.2</StyleCopVersion>
10+
<JsonNetVersion>10.0.3</JsonNetVersion>
11+
<TestSdkVersion>15.5.0</TestSdkVersion>
12+
<XunitVersion>2.3.1</XunitVersion>
13+
<XunitStudioVersion>2.3.1</XunitStudioVersion>
1314
</PropertyGroup>
1415
</Project>

‎scripts/appveyor_build.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
:: @ECHO OFF
22

33
:: Build packages
4-
cd src\Steeltoe.Extensions.Logging.CloudFoundry
4+
cd src\Steeltoe.Extensions.Logging.DynamicLogger
55
dotnet restore --configfile ..\..\nuget.config
66
IF NOT "%APPVEYOR_REPO_TAG_NAME%"=="" (
77
IF NOT "%STEELTOE_VERSION_SUFFIX%"=="" (

‎scripts/appveyor_install.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ dotnet --info
44

55
SET CI_BUILD=%APPVEYOR%
66
SET number=00000%APPVEYOR_BUILD_NUMBER%
7-
SET STEELTOE_VERSION=1.1.0
7+
SET STEELTOE_VERSION=2.0.0
88
SET STEELTOE_VERSION_SUFFIX=%APPVEYOR_REPO_BRANCH%-%number:~-5%
99
IF NOT "%APPVEYOR_REPO_TAG_NAME%"=="" SET STEELTOE_VERSION_SUFFIX=%APPVEYOR_REPO_TAG_NAME:~6,5%
1010
IF NOT "%STEELTOE_VERSION_SUFFIX%"=="" (

‎scripts/appveyor_tests.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@ECHO OFF
22

33
:: Run unit tests
4-
cd test\Steeltoe.Extensions.Logging.CloudFoundry.Test
4+
cd test\Steeltoe.Extensions.Logging.DynamicLogger.Test
55
dotnet restore --configfile ..\..\nuget.config
66
dotnet xunit -verbose
77
if not "%errorlevel%"=="0" goto failure

0 commit comments

Comments
 (0)