Skip to content

Commit 57a425e

Browse files
committed
Update the build
1 parent bc7af4c commit 57a425e

File tree

14 files changed

+44
-208
lines changed

14 files changed

+44
-208
lines changed

Exceptionless.RandomData.sln

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26228.9
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Exceptionless.RandomData", "src\Exceptionless.RandomData\Exceptionless.RandomData.xproj", "{6D157F81-A2C0-440C-A10B-488A8D3A7BF4}"
7-
EndProject
8-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Exceptionless.RandomData.Tests", "tests\Exceptionless.RandomData.Tests\Exceptionless.RandomData.Tests.xproj", "{853401B5-50F9-4183-994A-CFC28DEEBD0D}"
9-
EndProject
106
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{98954EAB-7EFF-44E3-A9D0-1A21AD220B8B}"
117
ProjectSection(SolutionItems) = preProject
128
appveyor.yml = appveyor.yml
13-
global.json = global.json
9+
build\common.props = build\common.props
1410
README.md = README.md
11+
build\sourcelink.props = build\sourcelink.props
12+
build\test.props = build\test.props
1513
EndProjectSection
1614
EndProject
15+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exceptionless.RandomData", "src\Exceptionless.RandomData\Exceptionless.RandomData.csproj", "{6D157F81-A2C0-440C-A10B-488A8D3A7BF4}"
16+
EndProject
17+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exceptionless.RandomData.Tests", "test\Exceptionless.RandomData.Tests\Exceptionless.RandomData.Tests.csproj", "{5BBE5992-708F-4B31-B522-1D1F317E1BA5}"
18+
EndProject
1719
Global
1820
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1921
Debug|Any CPU = Debug|Any CPU
@@ -24,10 +26,10 @@ Global
2426
{6D157F81-A2C0-440C-A10B-488A8D3A7BF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
2527
{6D157F81-A2C0-440C-A10B-488A8D3A7BF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
2628
{6D157F81-A2C0-440C-A10B-488A8D3A7BF4}.Release|Any CPU.Build.0 = Release|Any CPU
27-
{853401B5-50F9-4183-994A-CFC28DEEBD0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
28-
{853401B5-50F9-4183-994A-CFC28DEEBD0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
29-
{853401B5-50F9-4183-994A-CFC28DEEBD0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
30-
{853401B5-50F9-4183-994A-CFC28DEEBD0D}.Release|Any CPU.Build.0 = Release|Any CPU
29+
{5BBE5992-708F-4B31-B522-1D1F317E1BA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30+
{5BBE5992-708F-4B31-B522-1D1F317E1BA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
31+
{5BBE5992-708F-4B31-B522-1D1F317E1BA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
32+
{5BBE5992-708F-4B31-B522-1D1F317E1BA5}.Release|Any CPU.Build.0 = Release|Any CPU
3133
EndGlobalSection
3234
GlobalSection(SolutionProperties) = preSolution
3335
HideSolutionNode = FALSE

appveyor.yml

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,42 @@
11
version: 1.1.{build}
2-
os: Visual Studio 2015
3-
2+
os: Visual Studio 2017
3+
clone_depth: 2
44
configuration: Release
55

66
pull_requests:
77
do_not_increment_build_number: true
88

99
init:
10-
- git config --global core.autocrlf true
10+
- git config --global core.autocrlf input
1111
- ps: $env:GIT_HASH=$env:APPVEYOR_REPO_COMMIT.Substring(0, 10)
12-
13-
assembly_info:
14-
patch: true
15-
file: AssemblyInfo.*
16-
assembly_version: "{version}.0"
17-
assembly_file_version: "{version}.0"
18-
assembly_informational_version: "{version}.0 $(GIT_HASH)"
12+
- ps: If ("$env:APPVEYOR_REPO_TAG" -ne "true") { $env:VERSION_SUFFIX="pre" }
13+
- ps: 'Write-Output "Version: $($env:APPVEYOR_BUILD_VERSION)-$($env:VERSION_SUFFIX)"'
14+
- nuget sources add -name Foundatio -source https://ci.appveyor.com/nuget/foundatio
1915

2016
before_build:
21-
- ps: >-
22-
Get-ChildItem -Path .\ -Filter project.json -Recurse -Name |
23-
ForEach {
24-
$content = Get-Content "$_"
25-
$content = $content.Replace("99.99.99-dev", "$($env:APPVEYOR_BUILD_VERSION)")
26-
Set-Content "$_" $content -Encoding UTF8
27-
}
28-
- dotnet restore -v Minimal
17+
- ps: .\build\Set-BuildVersion -Version $env:APPVEYOR_BUILD_VERSION -Suffix $env:VERSION_SUFFIX
18+
- appveyor-retry dotnet restore -v Minimal
2919

3020
build_script:
3121
- dotnet pack "src\Exceptionless.RandomData" -c Release -o artifacts
3222

3323
test_script:
34-
- dotnet test "tests\Exceptionless.RandomData.Tests"
24+
- dotnet build -c Release
25+
- dotnet pack -c Release
3526

3627
artifacts:
3728
- path: artifacts\*.nupkg
3829
name: ReleaseArtifacts
30+
31+
nuget:
32+
project_feed: true
33+
disable_publish_on_pr: true
3934

4035
deploy:
4136
- provider: Environment
4237
name: NuGet
4338
on:
44-
branch: master
39+
appveyor_repo_tag: true
4540
- provider: GitHub
4641
auth_token:
4742
secure: 0s81q7bweVLTFSOKxnIhan7el6bIFiN8HJ1kYJzOkeFXX7wgGSq9bs/rV53X9qpf

global.json

Lines changed: 0 additions & 9 deletions
This file was deleted.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="..\..\build\common.props" />
3+
<PropertyGroup>
4+
<TargetFrameworks>netstandard1.3;net461</TargetFrameworks>
5+
</PropertyGroup>
6+
</Project>

src/Exceptionless.RandomData/Exceptionless.RandomData.xproj

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/Exceptionless.RandomData/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 14 deletions
This file was deleted.

src/Exceptionless.RandomData/project.json

Lines changed: 0 additions & 38 deletions
This file was deleted.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="..\..\build\test.props" />
3+
<PropertyGroup>
4+
<TargetFramework>net461</TargetFramework>
5+
</PropertyGroup>
6+
<ItemGroup>
7+
<ProjectReference Include="..\..\src\Exceptionless.RandomData\Exceptionless.RandomData.csproj" />
8+
</ItemGroup>
9+
</Project>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[assembly: Xunit.CollectionBehaviorAttribute(DisableTestParallelization = true, MaxParallelThreads = 1)]

0 commit comments

Comments
 (0)