Skip to content

Commit 27129f3

Browse files
niemyjskiniemyjski
authored
Upgrade to the new csproj format and update .net core clients
Upgrade to the new csproj format and update .net core clients
2 parents 5d06355 + 32a00dc commit 27129f3

File tree

129 files changed

+1634
-2312
lines changed

Some content is hidden

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

129 files changed

+1634
-2312
lines changed

‎.editorconfig

Lines changed: 34 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,42 @@
1-
# http://EditorConfig.org
2-
# https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference
1+
# EditorConfig is awesome:http://EditorConfig.org
32

3+
# top-most EditorConfig file
44
root = true
55

6+
# Don't use tabs for indentation.
67
[*]
7-
charset = utf-8
8-
end_of_line = crlf
9-
indent_size = 2
108
indent_style = space
11-
insert_final_newline = true
12-
trim_trailing_whitespace = true
9+
# (Please don't specify an indent_size here; that has too many unintended consequences.)
1310

14-
[*.md]
11+
# Code files
12+
[*.{cs,csx,vb,vbx}]
1513
indent_size = 4
16-
trim_trailing_whitespace = false
1714

15+
# Xml project files
16+
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
17+
indent_size = 2
18+
19+
# Xml config files
20+
[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
21+
indent_size = 2
22+
23+
# JSON files
24+
[*.json]
25+
indent_size = 2
1826

1927
# Dotnet code style settings:
2028
[*.{cs, vb}]
21-
indent_size = 4
22-
29+
# Sort using and Import directives with System.* appearing first
30+
dotnet_sort_system_directives_first = true
2331
# Avoid "this." and "Me." if not necessary
2432
dotnet_style_qualification_for_field = false:suggestion
2533
dotnet_style_qualification_for_property = false:suggestion
2634
dotnet_style_qualification_for_method = false:suggestion
2735
dotnet_style_qualification_for_event = false:suggestion
2836

2937
# Use language keywords instead of framework type names for type references
30-
dotnet_style_predefined_type_for_locals_parameters_members = true:error
31-
dotnet_style_predefined_type_for_member_access = false:error
38+
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
39+
dotnet_style_predefined_type_for_member_access = false:suggestion
3240

3341
# Suggest more modern language features when available
3442
dotnet_style_object_initializer = true:suggestion
@@ -39,18 +47,15 @@ dotnet_style_explicit_tuple_names = true:suggestion
3947

4048
# CSharp code style settings:
4149
[*.cs]
42-
# K&R styling
43-
csharp_new_line_before_open_brace = none:error
44-
4550
# Prefer "var" everywhere
46-
csharp_style_var_for_built_in_types = false:error
51+
csharp_style_var_for_built_in_types = false:suggestion
4752
csharp_style_var_when_type_is_apparent = true:suggestion
4853
csharp_style_var_elsewhere = true:suggestion
4954

5055
# Prefer method-like constructs to have a block body
51-
csharp_style_expression_bodied_methods = true:none
52-
csharp_style_expression_bodied_constructors = true:none
53-
csharp_style_expression_bodied_operators = true:none
56+
csharp_style_expression_bodied_methods = false:none
57+
csharp_style_expression_bodied_constructors = false:none
58+
csharp_style_expression_bodied_operators = false:none
5459

5560
# Prefer property-like constructs to have an expression-body
5661
csharp_style_expression_bodied_properties = true:none
@@ -62,4 +67,12 @@ csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
6267
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
6368
csharp_style_inlined_variable_declaration = true:suggestion
6469
csharp_style_throw_expression = true:suggestion
65-
csharp_style_conditional_delegate_call = true:suggestion
70+
csharp_style_conditional_delegate_call = true:suggestion
71+
72+
# Newline settings
73+
csharp_new_line_before_open_brace = false:error
74+
csharp_new_line_before_else = false:error
75+
csharp_new_line_before_catch = false:error
76+
csharp_new_line_before_finally = false:error
77+
csharp_new_line_before_members_in_object_initializers = false:error
78+
csharp_new_line_before_members_in_anonymous_types = false:error

‎.gitignore

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
/TestResults
2-
/Build
3-
41
## Ignore Visual Studio temporary files, build results, and
52
## files generated by popular Visual Studio add-ons.
63

@@ -11,17 +8,13 @@
118
*.ide
129

1310
# Build results
14-
1511
[Dd]ebug/
1612
[Rr]elease/
1713
x64/
18-
build/
1914
[Bb]in/
2015
[Oo]bj/
21-
src/Samples/Exceptionless.SampleConsole/store
22-
23-
!Libraries/Redis/bin/
24-
!Libraries/Mongo/bin/
16+
samples/Exceptionless.SampleConsole/store
17+
working
2518

2619
# MSTest test Results
2720
[Tt]est[Rr]esult*/

‎Exceptionless.Net.sln

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,39 @@
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
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{728C18BC-4085-4492-B0B2-8211CA209A50}"
77
ProjectSection(SolutionItems) = preProject
88
appveyor.yml = appveyor.yml
9-
Libraries\Build.ps1 = Libraries\Build.ps1
9+
build\Build.ps1 = build\Build.ps1
10+
build\common.props = build\common.props
1011
CONTRIBUTING.md = CONTRIBUTING.md
11-
global.json = global.json
12-
src\GlobalAssemblyInfo.cs = src\GlobalAssemblyInfo.cs
1312
LICENSE.txt = LICENSE.txt
14-
Libraries\Package.ps1 = Libraries\Package.ps1
13+
build\Package.ps1 = build\Package.ps1
1514
README.md = README.md
16-
Libraries\Settings.ps1 = Libraries\Settings.ps1
15+
build\Settings.ps1 = build\Settings.ps1
1716
EndProjectSection
1817
EndProject
19-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Exceptionless", "src\Exceptionless\Exceptionless.xproj", "{C3664CAF-6DE9-4049-951F-516C10FBA012}"
18+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platforms", "Platforms", "{D363E15F-621D-40E4-8C96-DEE41A7070FF}"
2019
EndProject
21-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Exceptionless.Tests", "tests\Exceptionless.Tests\Exceptionless.Tests.xproj", "{7961053F-A83D-48AE-9ABC-7EA134973223}"
20+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{2CEE12C6-3840-4C01-A952-D3026B0A662A}"
2221
EndProject
23-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platforms", "Platforms", "{D363E15F-621D-40E4-8C96-DEE41A7070FF}"
22+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exceptionless", "src\Exceptionless\Exceptionless.csproj", "{C3664CAF-6DE9-4049-951F-516C10FBA012}"
2423
EndProject
25-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Exceptionless.Log4net", "src\Platforms\Exceptionless.Log4net\Exceptionless.Log4net.xproj", "{40447BEF-BE34-46C2-B05B-2DF671586AD7}"
24+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exceptionless.Tests", "test\Exceptionless.Tests\Exceptionless.Tests.csproj", "{7961053F-A83D-48AE-9ABC-7EA134973223}"
2625
EndProject
27-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Exceptionless.NLog", "src\Platforms\Exceptionless.NLog\Exceptionless.NLog.xproj", "{A210FAF7-885E-44F4-85D4-F6D279EAFE82}"
26+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exceptionless.Log4net", "src\Platforms\Exceptionless.Log4net\Exceptionless.Log4net.csproj", "{40447BEF-BE34-46C2-B05B-2DF671586AD7}"
2827
EndProject
29-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Exceptionless.Mvc", "src\Platforms\Exceptionless.Mvc\Exceptionless.Mvc.xproj", "{A3139129-3FB8-451D-90D6-4BF6A5C8B479}"
28+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exceptionless.NLog", "src\Platforms\Exceptionless.NLog\Exceptionless.NLog.csproj", "{A210FAF7-885E-44F4-85D4-F6D279EAFE82}"
3029
EndProject
31-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Exceptionless.Nancy", "src\Platforms\Exceptionless.Nancy\Exceptionless.Nancy.xproj", "{76CC2F27-1B94-4375-A082-A167CFC5E6CB}"
30+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exceptionless.Mvc", "src\Platforms\Exceptionless.Mvc\Exceptionless.Mvc.csproj", "{A3139129-3FB8-451D-90D6-4BF6A5C8B479}"
3231
EndProject
33-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Exceptionless.Web", "src\Platforms\Exceptionless.Web\Exceptionless.Web.xproj", "{D4265DE5-6AA5-4566-8B51-4FC2158C8539}"
32+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exceptionless.Nancy", "src\Platforms\Exceptionless.Nancy\Exceptionless.Nancy.csproj", "{76CC2F27-1B94-4375-A082-A167CFC5E6CB}"
3433
EndProject
35-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Exceptionless.WebApi", "src\Platforms\Exceptionless.WebApi\Exceptionless.WebApi.xproj", "{E29380A2-85E5-468E-8D09-4E1CFDF5E90E}"
34+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exceptionless.Web", "src\Platforms\Exceptionless.Web\Exceptionless.Web.csproj", "{D4265DE5-6AA5-4566-8B51-4FC2158C8539}"
35+
EndProject
36+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exceptionless.WebApi", "src\Platforms\Exceptionless.WebApi\Exceptionless.WebApi.csproj", "{E29380A2-85E5-468E-8D09-4E1CFDF5E90E}"
3637
EndProject
3738
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exceptionless.Windows", "src\Platforms\Exceptionless.Windows\Exceptionless.Windows.csproj", "{159FB9D1-E226-4828-B2A5-FEDD994F3525}"
3839
ProjectSection(ProjectDependencies) = postProject
@@ -44,50 +45,48 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exceptionless.Wpf", "src\Pl
4445
{C3664CAF-6DE9-4049-951F-516C10FBA012} = {C3664CAF-6DE9-4049-951F-516C10FBA012}
4546
EndProjectSection
4647
EndProject
47-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{2CEE12C6-3840-4C01-A952-D3026B0A662A}"
48-
EndProject
49-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exceptionless.SampleWindows", "samples\\Exceptionless.SampleWindows\Exceptionless.SampleWindows.csproj", "{34FE8E6E-247B-46DD-967E-46E45D1CAE6D}"
48+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exceptionless.SampleWindows", "samples\Exceptionless.SampleWindows\Exceptionless.SampleWindows.csproj", "{34FE8E6E-247B-46DD-967E-46E45D1CAE6D}"
5049
ProjectSection(ProjectDependencies) = postProject
5150
{C3664CAF-6DE9-4049-951F-516C10FBA012} = {C3664CAF-6DE9-4049-951F-516C10FBA012}
5251
EndProjectSection
5352
EndProject
54-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exceptionless.SampleWpf", "samples\\Exceptionless.SampleWpf\Exceptionless.SampleWpf.csproj", "{C54027FA-B334-49C7-A58B-94B57677556C}"
53+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exceptionless.SampleWpf", "samples\Exceptionless.SampleWpf\Exceptionless.SampleWpf.csproj", "{C54027FA-B334-49C7-A58B-94B57677556C}"
5554
ProjectSection(ProjectDependencies) = postProject
5655
{C3664CAF-6DE9-4049-951F-516C10FBA012} = {C3664CAF-6DE9-4049-951F-516C10FBA012}
5756
EndProjectSection
5857
EndProject
59-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Exceptionless.SampleWebApi", "samples\\Exceptionless.SampleWebApi\Exceptionless.SampleWebApi.xproj", "{02EBBB5A-0F11-461E-9778-010F69C36545}"
58+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exceptionless.SampleWebApi", "samples\Exceptionless.SampleWebApi\Exceptionless.SampleWebApi.csproj", "{02EBBB5A-0F11-461E-9778-010F69C36545}"
6059
EndProject
61-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exceptionless.SampleNancy", "samples\\Exceptionless.SampleNancy\Exceptionless.SampleNancy.csproj", "{887A8565-4A10-44C8-82EF-F2F2D1D2BFBF}"
60+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exceptionless.SampleNancy", "samples\Exceptionless.SampleNancy\Exceptionless.SampleNancy.csproj", "{887A8565-4A10-44C8-82EF-F2F2D1D2BFBF}"
6261
ProjectSection(ProjectDependencies) = postProject
6362
{76CC2F27-1B94-4375-A082-A167CFC5E6CB} = {76CC2F27-1B94-4375-A082-A167CFC5E6CB}
6463
{C3664CAF-6DE9-4049-951F-516C10FBA012} = {C3664CAF-6DE9-4049-951F-516C10FBA012}
6564
EndProjectSection
6665
EndProject
67-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exceptionless.SampleWcf", "samples\\Exceptionless.SampleWcf\Exceptionless.SampleWcf.csproj", "{D03FB8BA-EE59-42DD-840F-E7791B4609F0}"
66+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exceptionless.SampleWcf", "samples\Exceptionless.SampleWcf\Exceptionless.SampleWcf.csproj", "{D03FB8BA-EE59-42DD-840F-E7791B4609F0}"
6867
ProjectSection(ProjectDependencies) = postProject
6968
{C3664CAF-6DE9-4049-951F-516C10FBA012} = {C3664CAF-6DE9-4049-951F-516C10FBA012}
7069
{D4265DE5-6AA5-4566-8B51-4FC2158C8539} = {D4265DE5-6AA5-4566-8B51-4FC2158C8539}
7170
EndProjectSection
7271
EndProject
73-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exceptionless.SampleWeb", "samples\\Exceptionless.SampleWeb\Exceptionless.SampleWeb.csproj", "{DAE5248F-75FC-42CC-96A7-34C470F28641}"
72+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exceptionless.SampleWeb", "samples\Exceptionless.SampleWeb\Exceptionless.SampleWeb.csproj", "{DAE5248F-75FC-42CC-96A7-34C470F28641}"
7473
ProjectSection(ProjectDependencies) = postProject
7574
{C3664CAF-6DE9-4049-951F-516C10FBA012} = {C3664CAF-6DE9-4049-951F-516C10FBA012}
7675
{D4265DE5-6AA5-4566-8B51-4FC2158C8539} = {D4265DE5-6AA5-4566-8B51-4FC2158C8539}
7776
EndProjectSection
7877
EndProject
79-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exceptionless.SampleMvc", "samples\\Exceptionless.SampleMvc\Exceptionless.SampleMvc.csproj", "{B7075822-FBB6-4B3A-A639-37C39DC27BB6}"
78+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exceptionless.SampleMvc", "samples\Exceptionless.SampleMvc\Exceptionless.SampleMvc.csproj", "{B7075822-FBB6-4B3A-A639-37C39DC27BB6}"
8079
ProjectSection(ProjectDependencies) = postProject
8180
{A3139129-3FB8-451D-90D6-4BF6A5C8B479} = {A3139129-3FB8-451D-90D6-4BF6A5C8B479}
8281
{E29380A2-85E5-468E-8D09-4E1CFDF5E90E} = {E29380A2-85E5-468E-8D09-4E1CFDF5E90E}
8382
{C3664CAF-6DE9-4049-951F-516C10FBA012} = {C3664CAF-6DE9-4049-951F-516C10FBA012}
8483
EndProjectSection
8584
EndProject
86-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Exceptionless.AspNetCore", "src\Platforms\Exceptionless.AspNetCore\Exceptionless.AspNetCore.xproj", "{F949CF8F-9D5F-454B-B20A-D8F9C22B70D9}"
85+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exceptionless.AspNetCore", "src\Platforms\Exceptionless.AspNetCore\Exceptionless.AspNetCore.csproj", "{F949CF8F-9D5F-454B-B20A-D8F9C22B70D9}"
8786
EndProject
88-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Exceptionless.SampleAspNetCore", "samples\\Exceptionless.SampleAspNetCore\Exceptionless.SampleAspNetCore.xproj", "{D7039656-8587-49CC-8657-5C9BDCFC1C80}"
87+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exceptionless.SampleAspNetCore", "samples\Exceptionless.SampleAspNetCore\Exceptionless.SampleAspNetCore.csproj", "{D7039656-8587-49CC-8657-5C9BDCFC1C80}"
8988
EndProject
90-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Exceptionless.SampleConsole", "samples\\Exceptionless.SampleConsole\Exceptionless.SampleConsole.xproj", "{23645F73-57D8-4D70-BE1A-37903A8E4A18}"
89+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exceptionless.SampleConsole", "samples\Exceptionless.SampleConsole\Exceptionless.SampleConsole.csproj", "{23645F73-57D8-4D70-BE1A-37903A8E4A18}"
9190
EndProject
9291
Global
9392
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎Exceptionless.Net.sln.DotSettings

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -544,6 +544,7 @@
544544
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsCodeFormatterSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
545545
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsParsFormattingSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
546546
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsWrapperSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
547+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EXml_002ECodeStyle_002EFormatSettingsUpgrade_002EXmlMoveToCommonFormatterSettingsUpgrade/@EntryIndexedValue">True</s:Boolean>
547548
<s:String x:Key="/Default/Environment/UnitTesting/JavaScriptUnitTestProviders/BrowserLocation/@EntryValue">C:\Users\Blake\AppData\Local\Google\Chrome\Application\chrome.exe</s:String>
548549
<s:Boolean x:Key="/Default/Environment/UnitTesting/SaveSessionState/@EntryValue">False</s:Boolean>
549550
<s:Boolean x:Key="/Default/Environment/UserInterface/CyclicSelectionInLists/@EntryValue">False</s:Boolean>

‎NuGet.Config

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<add key="appveyor-bdn" value="https://ci.appveyor.com/nuget/benchmarkdotnet" />
5+
</packageSources>
6+
</configuration>

‎appveyor.yml

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
version: 4.0.{build}
2-
os: Visual Studio 2015
2+
os: Visual Studio 2017
33
clone_depth: 2
44
configuration: Release
55

66
pull_requests:
77
do_not_increment_build_number: true
8-
9-
#environment:
10-
# VERSION_SUFFIX: -beta
118

12-
init:
13-
- git config --global core.autocrlf true
9+
init:
10+
- git config --global core.autocrlf input
1411
- ps: $env:GIT_HASH=$env:APPVEYOR_REPO_COMMIT.Substring(0, 10)
15-
- ps: If ("$env:APPVEYOR_REPO_BRANCH" -ne "master") { $env:VERSION_SUFFIX="-pre" }
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)"'
1614

1715
assembly_info:
1816
patch: true
@@ -22,40 +20,39 @@ assembly_info:
2220
assembly_informational_version: "{version}$(VERSION_SUFFIX) $(GIT_HASH)"
2321

2422
install:
25-
- ps: .\tools\DisplayEnvironmentInfo.ps1
23+
- ps: .\build\DisplayEnvironmentInfo.ps1
2624

2725
before_build:
28-
- ps: >-
29-
Get-ChildItem -Path .\ -Filter project.json -Recurse -Name |
30-
ForEach {
31-
$content = Get-Content "$_"
32-
$content = $content.Replace("99.99.99-dev", "$($env:APPVEYOR_BUILD_VERSION)$($env:VERSION_SUFFIX)")
33-
Set-Content "$_" $content -Encoding UTF8
34-
}
35-
- dotnet restore -v Minimal
26+
- ps: .\build\Set-BuildVersion -Version $env:APPVEYOR_BUILD_VERSION -Suffix $env:VERSION_SUFFIX
27+
- appveyor-retry dotnet restore -v Minimal
28+
- ps: Get-ChildItem -Path .\src -Recurse -Include @("*.Signed", "*Portable") | ForEach-Object { & appveyor-retry dotnet restore $_ -v Minimal }
3629

3730
build_script:
38-
- ps: .\tools\Build.ps1
31+
- ps: .\build\Build.ps1
32+
- dotnet build test\Exceptionless.Tests -c Release
3933

40-
test_script:
41-
- dotnet test tests\Exceptionless.Tests\
34+
#test_script:
35+
# - dotnet test test\Exceptionless.Tests\
4236

4337
after_test:
44-
- ps: .\tools\Package.ps1
38+
- ps: .\build\Package.ps1
4539

4640
artifacts:
4741
- path: artifacts\*.nupkg
4842
name: ReleaseArtifacts
4943

5044
deploy:
45+
- provider: Environment
46+
name: MyGet
5147
- provider: Environment
5248
name: NuGet
49+
on:
50+
appveyor_repo_tag: true
5351
- provider: GitHub
5452
auth_token:
5553
secure: 0s81q7bweVLTFSOKxnIhan7el6bIFiN8HJ1kYJzOkeFXX7wgGSq9bs/rV53X9qpf
5654
draft: true
5755
on:
58-
branch: master
5956
appveyor_repo_tag: true
6057

6158
notifications:

0 commit comments

Comments
 (0)