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

Commit 0134d5f

Browse files
committed
#6 net core 2.1.0-rc1, updating app metrics ref to 3.0.0, updating copy right headers
1 parent b21db76 commit 0134d5f

File tree

54 files changed

+126
-113
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+126
-113
lines changed

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ deploy:
3333
skip_symbols: true
3434
symbol_server: https://www.myget.org/F/appmetrics/symbol
3535
install:
36-
- cmd: curl -O https://download.microsoft.com/download/3/7/C/37C0D2E3-2056-4F9A-A67C-14DEFBD70F06/dotnet-sdk-2.1.300-preview2-008530-win-x64.exe
37-
- cmd: dotnet-sdk-2.1.300-preview2-008530-win-x64.exe /install /quiet /norestart /log install.log
36+
- cmd: curl -O https://download.microsoft.com/download/B/1/9/B19A2F87-F00F-420C-B4B9-A0BA4403F754/dotnet-sdk-2.1.300-rc1-008673-win-x64.exe
37+
- cmd: dotnet-sdk-2.1.300-rc1-008673-win-x64.exe /install /quiet /norestart /log install.log
3838
skip_commits:
3939
files:
4040
- '**/*.md'

build.cake

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,23 +73,36 @@ var coverExcludeFilter = "-:*.Facts -:*.FactsCommon";
7373
var excludeFromCoverage = "*.ExcludeFromCodeCoverage*";
7474
string versionSuffix = null;
7575

76-
if (!string.IsNullOrEmpty(preReleaseSuffix))
76+
if (AppVeyor.IsRunningOnAppVeyor)
7777
{
78-
if (packageRelease && AppVeyor.IsRunningOnAppVeyor && AppVeyor.Environment.Repository.Tag.IsTag)
78+
if (AppVeyor.Environment.Repository.Tag.IsTag)
7979
{
80-
versionSuffix = preReleaseSuffix;
80+
// Stable release package, pushed to nuget
81+
}
82+
else if (string.IsNullOrEmpty(preReleaseSuffix))
83+
{
84+
// Next stable release development package, not pushed to nuget
85+
versionSuffix = buildNumber.ToString("D4");
8186
}
8287
else
8388
{
84-
versionSuffix = preReleaseSuffix + "-" + buildNumber.ToString("D4");
89+
if (packageRelease)
90+
{
91+
// Pre-release package, set version suffix without build number, not tagged until stable release but pushed to nuget
92+
versionSuffix = preReleaseSuffix;
93+
}
94+
else
95+
{
96+
// Pre-release development package, set version suffix with build number, not pushed to nuget
97+
versionSuffix = preReleaseSuffix + "-" + buildNumber.ToString("D4");
98+
}
8599
}
86100
}
87-
else if (AppVeyor.IsRunningOnAppVeyor && !AppVeyor.Environment.Repository.Tag.IsTag && !packageRelease)
101+
else
88102
{
89-
versionSuffix = buildNumber.ToString("D4");
103+
versionSuffix = preReleaseSuffix + "-" + buildNumber.ToString("D4");
90104
}
91105

92-
93106
//////////////////////////////////////////////////////////////////////
94107
// TASKS
95108
//////////////////////////////////////////////////////////////////////

build/dependencies.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<Project>
22
<PropertyGroup>
3-
<AppMetricsCoreVersion>2.1.0-*</AppMetricsCoreVersion>
3+
<AppMetricsCoreVersion>3.0.0-*</AppMetricsCoreVersion>
44
<AppMetricsHealthCoreVersion>2.1.0-*</AppMetricsHealthCoreVersion>
5-
<MicrosoftExtensionsVersion>2.1.0-preview2-final</MicrosoftExtensionsVersion>
5+
<MicrosoftExtensionsVersion>2.1.0-rc1-final</MicrosoftExtensionsVersion>
66
<CoreFxVersion>4.4.0</CoreFxVersion>
77
<DependencyModelVersion>2.1.0-*</DependencyModelVersion>
8-
<LibLogVersion>4.2.6</LibLogVersion>
9-
<MicrosoftCSharpVersion>4.4.0</MicrosoftCSharpVersion>
8+
<LibLogVersion>4.4.0</LibLogVersion>
9+
<MicrosoftCSharpVersion>4.5.0-rc1</MicrosoftCSharpVersion>
1010
<MoqVersion>4.8.2</MoqVersion>
1111
<NewtonsoftVersion>11.0.2</NewtonsoftVersion>
1212
<TestSdkVersion>15.7.0</TestSdkVersion>
1313
<XunitVersion>2.4.0-beta.1.build3958</XunitVersion>
14-
<FluentAssertionsVersion>5.2.0</FluentAssertionsVersion>
14+
<FluentAssertionsVersion>5.3.0</FluentAssertionsVersion>
1515
<FluentAssertionsJsonVersion>5.0.0</FluentAssertionsJsonVersion>
1616
<StyleCopAnalyzersVersion>1.0.0</StyleCopAnalyzersVersion>
1717
</PropertyGroup>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"projects": [ "src", "test", "sandbox" ],
33
"sdk": {
4-
"version": "2.1.300-preview2"
4+
"version": "2.1.300-rc1"
55
}
66
}

sandbox/HealthChecks/SampleReferencedAssemblyHealthCheck.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// <copyright file="SampleReferencedAssemblyHealthCheck.cs" company="Allan Hardy">
2-
// Copyright (c) Allan Hardy. All rights reserved.
1+
// <copyright file="SampleReferencedAssemblyHealthCheck.cs" company="App Metrics Contributors">
2+
// Copyright (c) App Metrics Contributors. All rights reserved.
33
// </copyright>
44

55
using System;

sandbox/HealthHostingMicrosoftExtensionsSandbox/Extensions/HostExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// <copyright file="HostExtensions.cs" company="Allan Hardy">
2-
// Copyright (c) Allan Hardy. All rights reserved.
1+
// <copyright file="HostExtensions.cs" company="App Metrics Contributors">
2+
// Copyright (c) App Metrics Contributors. All rights reserved.
33
// </copyright>
44

55
using System;

sandbox/HealthHostingMicrosoftExtensionsSandbox/Host.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// <copyright file="Host.cs" company="Allan Hardy">
2-
// Copyright (c) Allan Hardy. All rights reserved.
1+
// <copyright file="Host.cs" company="App Metrics Contributors">
2+
// Copyright (c) App Metrics Contributors. All rights reserved.
33
// </copyright>
44

55
using System;

sandbox/HealthHostingMicrosoftExtensionsSandbox/SampleHealthCheck.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// <copyright file="SampleHealthCheck.cs" company="Allan Hardy">
2-
// Copyright (c) Allan Hardy. All rights reserved.
1+
// <copyright file="SampleHealthCheck.cs" company="App Metrics Contributors">
2+
// Copyright (c) App Metrics Contributors. All rights reserved.
33
// </copyright>
44

55
using System;

sandbox/HealthMicrosoftExtensionsSandbox/Host.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// <copyright file="Host.cs" company="Allan Hardy">
2-
// Copyright (c) Allan Hardy. All rights reserved.
1+
// <copyright file="Host.cs" company="App Metrics Contributors">
2+
// Copyright (c) App Metrics Contributors. All rights reserved.
33
// </copyright>
44

55
using System;

sandbox/HealthMicrosoftExtensionsSandbox/SampleHealthCheck.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// <copyright file="SampleHealthCheck.cs" company="Allan Hardy">
2-
// Copyright (c) Allan Hardy. All rights reserved.
1+
// <copyright file="SampleHealthCheck.cs" company="App Metrics Contributors">
2+
// Copyright (c) App Metrics Contributors. All rights reserved.
33
// </copyright>
44

55
using System;

0 commit comments

Comments
 (0)