Skip to content

Commit b95853f

Browse files
niemyjskiniemyjski
committed
Added missing build script and fixed a ton of cli issues
1 parent 9614d2b commit b95853f

File tree

20 files changed

+182
-127
lines changed

20 files changed

+182
-127
lines changed

‎.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,13 @@
88
*.ide
99

1010
# Build results
11-
1211
[Dd]ebug/
1312
[Rr]elease/
1413
x64/
1514
[Bb]in/
1615
[Oo]bj/
1716
src/Samples/Exceptionless.SampleConsole/store
1817

19-
!Libraries/Redis/bin/
20-
!Libraries/Mongo/bin/
21-
2218
# MSTest test Results
2319
[Tt]est[Rr]esult*/
2420
[Bb]uild[Ll]og.*

‎appveyor.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,17 @@ artifacts:
4141
name: ReleaseArtifacts
4242

4343
deploy:
44+
- provider: Environment
45+
name: MyGet
4446
- provider: Environment
4547
name: NuGet
48+
on:
49+
appveyor_repo_tag: true
4650
- provider: GitHub
4751
auth_token:
4852
secure: 0s81q7bweVLTFSOKxnIhan7el6bIFiN8HJ1kYJzOkeFXX7wgGSq9bs/rV53X9qpf
4953
draft: true
5054
on:
51-
branch: master
5255
appveyor_repo_tag: true
5356

5457
notifications:

‎build/Set-BuildVersion.ps1

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Param(
2+
[string]$Version,
3+
[string]$Suffix
4+
)
5+
6+
Push-Location $PSScriptRoot
7+
8+
[xml]$versionXml = Get-Content .\version.props
9+
$versionXml.Project.PropertyGroup.VersionPrefix = $Version
10+
$versionXml.Project.PropertyGroup.VersionSuffix = $Suffix
11+
$versionXml.Save("$PSScriptRoot\version.props")
12+
13+
Pop-Location

‎samples/Exceptionless.SampleMvc/Exceptionless.SampleMvc.csproj

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -181,13 +181,9 @@
181181
<ItemGroup>
182182
<Folder Include="Properties\" />
183183
</ItemGroup>
184-
<PropertyGroup>
185-
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
186-
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
187-
</PropertyGroup>
188184
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
189185
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
190-
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\$(VisualStudioVersion)\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
186+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
191187
<Target Name="MvcBuildViews" AfterTargets="AfterBuild" Condition="'$(MvcBuildViews)'=='true'">
192188
<AspNetCompiler VirtualPath="temp" PhysicalPath="$(WebProjectOutputDir)" />
193189
</Target>

‎samples/Exceptionless.SampleNancy/Exceptionless.SampleNancy.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,6 @@
7373
<ItemGroup>
7474
<Folder Include="Properties\" />
7575
</ItemGroup>
76-
<PropertyGroup>
77-
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
78-
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
79-
</PropertyGroup>
8076
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
8177
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
8278
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />

‎samples/Exceptionless.SampleWcf/Exceptionless.SampleWcf.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,6 @@
9090
<ItemGroup>
9191
<Folder Include="Properties\" />
9292
</ItemGroup>
93-
<PropertyGroup>
94-
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
95-
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
96-
</PropertyGroup>
9793
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
9894
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
9995
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />

‎samples/Exceptionless.SampleWeb/Exceptionless.SampleWeb.csproj

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,9 @@
124124
<ItemGroup>
125125
<Folder Include="Properties\" />
126126
</ItemGroup>
127-
<PropertyGroup>
128-
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
129-
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
130-
</PropertyGroup>
131127
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
128+
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
129+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
132130
<ProjectExtensions>
133131
<VisualStudio>
134132
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
@@ -147,6 +145,4 @@
147145
</FlavorProperties>
148146
</VisualStudio>
149147
</ProjectExtensions>
150-
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
151-
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
152148
</Project>

‎src/Exceptionless.Portable.Signed/Exceptionless.Portable.Signed.csproj

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="..\..\build\common.props" />
3+
4+
<PropertyGroup Label="Package">
5+
<PackageId>Exceptionless.Portable.Signed</PackageId>
6+
<AssemblyName>Exceptionless.Portable.Signed</AssemblyName>
7+
<AssemblyTitle>[DEPRECATED] Exceptionless Portable Class Library</AssemblyTitle>
8+
<Description>[DEPRECATED] Please install the Exceptionless.Signed package instead.</Description>
9+
<PackageTags>Exceptionless;Error;Report;Reporting;Exception;Logging;Log;ELMAH;pcl</PackageTags>
10+
<TargetFrameworks>netstandard1.2;netstandard1.3;netstandard1.4;netstandard1.5;portable46-net451+win81+wpa81;net45</TargetFrameworks>
11+
</PropertyGroup>
12+
13+
<ItemGroup Label="Package">
14+
<None Update="readme.txt">
15+
<Pack>true</Pack>
16+
</None>
17+
</ItemGroup>
18+
19+
<ItemGroup Label="Build">
20+
<Compile Include="..\GlobalAssemblyInfo.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
21+
</ItemGroup>
22+
23+
<PropertyGroup Label="Signing">
24+
<SignAssembly>true</SignAssembly>
25+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
26+
<AssemblyOriginatorKeyFile>..\Exceptionless.snk</AssemblyOriginatorKeyFile>
27+
</PropertyGroup>
28+
29+
<ItemGroup>
30+
<ProjectReference Include="..\Exceptionless.Signed\Exceptionless.Signed.csproj" />
31+
</ItemGroup>
32+
33+
<PropertyGroup Condition="'$(TargetFramework)' == 'portable46-net451+win81+wpa81'" Label="Build">
34+
<TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
35+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
36+
<TargetFrameworkProfile>Profile151</TargetFrameworkProfile>
37+
<DefineConstants>$(DefineConstants);PORTABLE;SIGNED</DefineConstants>
38+
</PropertyGroup>
39+
40+
<ItemGroup Condition="'$(TargetFramework)' == 'portable46-net451+win81+wpa81'" Label="Framework References">
41+
<Reference Include="Microsoft.CSharp" />
42+
<Reference Include="System" />
43+
<Reference Include="System.Dynamic.Runtime" />
44+
<Reference Include="System.Globalization" />
45+
<Reference Include="System.IO" />
46+
<Reference Include="System.IO.Compression" />
47+
<Reference Include="System.Linq" />
48+
<Reference Include="System.Linq.Expressions" />
49+
<Reference Include="System.Net.Http" />
50+
<Reference Include="System.Net.Primitives" />
51+
<Reference Include="System.ObjectModel" />
52+
<Reference Include="System.Reflection" />
53+
<Reference Include="System.Reflection.Extensions" />
54+
<Reference Include="System.Reflection.Primitives" />
55+
<Reference Include="System.Resources.ResourceManager" />
56+
<Reference Include="System.Runtime" />
57+
<Reference Include="System.Runtime.Extensions" />
58+
<Reference Include="System.Runtime.Serialization" />
59+
<Reference Include="System.Runtime.Serialization.Primitives" />
60+
<Reference Include="System.Text.Encoding" />
61+
<Reference Include="System.Text.Encoding.Extensions" />
62+
<Reference Include="System.Text.RegularExpressions" />
63+
<Reference Include="System.Threading" />
64+
<Reference Include="System.Threading.Tasks" />
65+
<Reference Include="System.Threading.Timer" />
66+
<Reference Include="System.Xml" />
67+
<Reference Include="System.Xml.Linq" />
68+
<Reference Include="System.Xml.ReaderWriter" />
69+
<Reference Include="System.Xml.XDocument" />
70+
</ItemGroup>
71+
72+
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' " Label="Framework References">
73+
<Reference Include="System" />
74+
<Reference Include="Microsoft.CSharp" />
75+
</ItemGroup>
76+
</Project>

‎src/Exceptionless.Portable.Signed/project.json

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

‎src/Exceptionless.Portable/Exceptionless.Portable.csproj

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="..\..\build\common.props" />
3+
4+
<PropertyGroup Label="Package">
5+
<PackageId>Exceptionless.Portable</PackageId>
6+
<AssemblyName>Exceptionless.Portable</AssemblyName>
7+
<AssemblyTitle>[DEPRECATED] Exceptionless Portable Class Library</AssemblyTitle>
8+
<Description>[DEPRECATED] Please install the Exceptionless package instead.</Description>
9+
<PackageTags>Exceptionless;Error;Report;Reporting;Exception;Logging;Log;ELMAH;pcl</PackageTags>
10+
<TargetFrameworks>netstandard1.2;netstandard1.3;netstandard1.4;netstandard1.5;portable46-net451+win81+wpa81;net45</TargetFrameworks>
11+
</PropertyGroup>
12+
13+
<ItemGroup Label="Package">
14+
<None Update="readme.txt">
15+
<Pack>true</Pack>
16+
</None>
17+
</ItemGroup>
18+
19+
<ItemGroup Label="Build">
20+
<Compile Include="..\GlobalAssemblyInfo.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
21+
</ItemGroup>
22+
23+
<ItemGroup Label="Project References">
24+
<ProjectReference Include="..\Exceptionless\Exceptionless.csproj" />
25+
</ItemGroup>
26+
27+
<PropertyGroup Condition="'$(TargetFramework)' == 'portable46-net451+win81+wpa81'" Label="Build">
28+
<TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
29+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
30+
<TargetFrameworkProfile>Profile151</TargetFrameworkProfile>
31+
<DefineConstants>$(DefineConstants);PORTABLE</DefineConstants>
32+
</PropertyGroup>
33+
34+
<ItemGroup Condition="'$(TargetFramework)' == 'portable46-net451+win81+wpa81'" Label="Framework References">
35+
<Reference Include="Microsoft.CSharp" />
36+
<Reference Include="System" />
37+
<Reference Include="System.Dynamic.Runtime" />
38+
<Reference Include="System.Globalization" />
39+
<Reference Include="System.IO" />
40+
<Reference Include="System.IO.Compression" />
41+
<Reference Include="System.Linq" />
42+
<Reference Include="System.Linq.Expressions" />
43+
<Reference Include="System.Net.Http" />
44+
<Reference Include="System.Net.Primitives" />
45+
<Reference Include="System.ObjectModel" />
46+
<Reference Include="System.Reflection" />
47+
<Reference Include="System.Reflection.Extensions" />
48+
<Reference Include="System.Reflection.Primitives" />
49+
<Reference Include="System.Resources.ResourceManager" />
50+
<Reference Include="System.Runtime" />
51+
<Reference Include="System.Runtime.Extensions" />
52+
<Reference Include="System.Runtime.Serialization" />
53+
<Reference Include="System.Runtime.Serialization.Primitives" />
54+
<Reference Include="System.Text.Encoding" />
55+
<Reference Include="System.Text.Encoding.Extensions" />
56+
<Reference Include="System.Text.RegularExpressions" />
57+
<Reference Include="System.Threading" />
58+
<Reference Include="System.Threading.Tasks" />
59+
<Reference Include="System.Threading.Timer" />
60+
<Reference Include="System.Xml" />
61+
<Reference Include="System.Xml.Linq" />
62+
<Reference Include="System.Xml.ReaderWriter" />
63+
<Reference Include="System.Xml.XDocument" />
64+
</ItemGroup>
65+
66+
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' " Label="Framework References">
67+
<Reference Include="System" />
68+
<Reference Include="Microsoft.CSharp" />
69+
</ItemGroup>
70+
</Project>

0 commit comments

Comments
 (0)