Skip to content

Commit 6151a28

Browse files
niemyjskiniemyjski
committed
#142 Updates to csproj
1 parent a0664ae commit 6151a28

File tree

20 files changed

+260
-393
lines changed

20 files changed

+260
-393
lines changed

‎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>

‎build/Build.ps1

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@ $anyError = $False
66
ForEach ($p in $client_projects) {
77
If ($($p.UseMSBuild) -ne $True) {
88
Write-Host "Building $($p.Name)" -ForegroundColor Yellow
9-
If ($($p.Name).EndsWith(".Signed")) {
10-
dotnet pack $($p.SourceDir) -c Release -o $artifacts_dir /p:SignAssembly=true
11-
} Else {
12-
dotnet pack $($p.SourceDir) -c Release -o $artifacts_dir
13-
}
9+
dotnet pack $($p.SourceDir) -c Release -o $artifacts_dir
1410
Write-Host "Finished building $($p.Name)" -ForegroundColor Yellow
1511

1612
If ($LASTEXITCODE -ne 0) {

‎build/common.props

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,28 @@
11
<Project ToolsVersion="15.0">
22
<Import Project="version.props" />
3+
4+
<PropertyGroup Label="Build">
5+
<DebugType>portable</DebugType>
6+
<NoWarn>$(NoWarn);CS1591</NoWarn>
7+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
8+
<VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
9+
10+
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
11+
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
12+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
13+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
14+
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
15+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
16+
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
17+
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
18+
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
19+
</PropertyGroup>
320

4-
<PropertyGroup>
21+
<PropertyGroup Label="Package">
522
<Product>Exceptionless</Product>
623
<Description>Exceptionless is a cloud based error reporting service that sends your exceptions to https://exceptionless.com and provides aggregated views and analytics.</Description>
7-
<Copyright>Copyright (c) 2017 Exceptionless. All rights reserved.</Copyright>
24+
<Copyright>Copyright (c) 2017 Exceptionless. All rights reserved.</Copyright>
825
<Authors>Exceptionless</Authors>
9-
<NoWarn>$(NoWarn);CS1591</NoWarn>
10-
<WarningsAsErrors>true</WarningsAsErrors>
11-
<DebugType>portable</DebugType>
1226
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1327
<PackageOutputPath>$(SolutionDir)artifacts</PackageOutputPath>
1428
<IncludeSymbols>True</IncludeSymbols>
@@ -20,16 +34,5 @@
2034
<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
2135
<RepositoryType>git</RepositoryType>
2236
<RepositoryUrl>https://github.com/exceptionless/Exceptionless.Net</RepositoryUrl>
23-
<VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
24-
25-
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
26-
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
27-
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
28-
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
29-
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
30-
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
31-
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
32-
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
33-
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
3437
</PropertyGroup>
3538
</Project>

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

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,46 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\build\common.props" />
33

4-
<PropertyGroup>
4+
<PropertyGroup Label="Package">
55
<PackageId>Exceptionless.Signed</PackageId>
66
<AssemblyName>Exceptionless.Signed</AssemblyName>
77
<AssemblyTitle>Exceptionless client for non visual (ie. Console and Services) applications.</AssemblyTitle>
88
<Description>Exceptionless client for portable applications. $(Description)</Description>
9-
<TargetFrameworks>netstandard1.2;netstandard1.3;netstandard1.4;netstandard1.5;portable46-net451+win81+wpa81;net45</TargetFrameworks>
109
<PackageTags>Exceptionless;Error;Report;Reporting;Exception;Logging;Log;ELMAH;pcl;NETSTANDARD;Core</PackageTags>
11-
<AssemblyOriginatorKeyFile>..\Exceptionless.snk</AssemblyOriginatorKeyFile>
12-
<OutputPath>bin\$(Configuration)\signed</OutputPath>
1310
</PropertyGroup>
14-
15-
<ItemGroup>
16-
<Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs" />
17-
<Compile Remove="Exceptionless.csproj" />
18-
</ItemGroup>
19-
20-
<ItemGroup>
21-
<EmbeddedResource Include="Newtonsoft.Json\Dynamic.snk">
22-
<Link>Exceptionless.Json.Dynamic.snk</Link>
23-
</EmbeddedResource>
24-
<None Update="NuGet\tools\*">
25-
<PackagePath>tools/</PackagePath>
26-
<Pack>true</Pack>
27-
</None>
28-
<None Update="NuGet\tools\exceptionless.signed.psm1">
29-
<PackagePath>tools\exceptionless.psm1</PackagePath>
11+
12+
<ItemGroup Label="Package">
13+
<None Update="..\Exceptionless\readme.txt">
14+
<PackagePath></PackagePath>
3015
<Pack>true</Pack>
3116
</None>
32-
<None Update="readme.txt">
17+
<None Update="NuGet\tools\*">
18+
<PackagePath>tools/</PackagePath>
3319
<Pack>true</Pack>
3420
</None>
3521
</ItemGroup>
3622

37-
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.2'">
23+
<ItemGroup Label="Build">
24+
<TargetFrameworks>netstandard1.2;netstandard1.3;netstandard1.4;netstandard1.5;portable46-net451+win81+wpa81;net45</TargetFrameworks>
25+
<Compile Remove="..\Exceptionless\obj\**\*" />
26+
<Compile Include="..\Exceptionless\**\*.cs;..\GlobalAssemblyInfo.cs" Exclude="..\Exceptionless\obj\**\*;bin\**;obj\**;**\*.xproj;packages\**" />
27+
28+
<EmbeddedResource Include="..\Exceptionless\Newtonsoft.Json\Dynamic.snk">
29+
<Link>Exceptionless.Json.Dynamic.snk</Link>
30+
</EmbeddedResource>
31+
</ItemGroup>
32+
33+
<PropertyGroup Label="Signing">
34+
<SignAssembly>true</SignAssembly>
35+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
36+
<AssemblyOriginatorKeyFile>..\Exceptionless.snk</AssemblyOriginatorKeyFile>
37+
</PropertyGroup>
38+
39+
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.2'" Label="Build">
3840
<DefineConstants>$(DefineConstants);NO_SQL_CLIENT;NETSTANDARD;NETSTANDARD1_2;SIGNED</DefineConstants>
3941
</PropertyGroup>
4042

41-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.2'">
43+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.2'" Label="Package References">
4244
<PackageReference Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
4345
<PackageReference Include="System.Data.Common" Version="4.3.0" />
4446
<PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
@@ -48,11 +50,11 @@
4850
<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
4951
</ItemGroup>
5052

51-
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
53+
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.3'" Label="Build">
5254
<DefineConstants>$(DefineConstants);NO_SQL_CLIENT;NETSTANDARD;NETSTANDARD1_3;SIGNED</DefineConstants>
5355
</PropertyGroup>
5456

55-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
57+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'" Label="Package References">
5658
<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
5759
<PackageReference Include="System.AppDomain" Version="2.0.11" />
5860
<PackageReference Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
@@ -70,11 +72,11 @@
7072
<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
7173
</ItemGroup>
7274

73-
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.4'">
75+
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.4'" Label="Build">
7476
<DefineConstants>$(DefineConstants);NO_SQL_CLIENT;NETSTANDARD;NETSTANDARD1_4;SIGNED</DefineConstants>
7577
</PropertyGroup>
7678

77-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.4'">
79+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.4'" Label="Package References">
7880
<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
7981
<PackageReference Include="System.AppDomain" Version="2.0.11" />
8082
<PackageReference Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
@@ -92,11 +94,11 @@
9294
<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
9395
</ItemGroup>
9496

95-
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.5'">
97+
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.5'" Label="Build">
9698
<DefineConstants>$(DefineConstants);NO_SQL_CLIENT;NETSTANDARD;NETSTANDARD1_5;SIGNED</DefineConstants>
9799
</PropertyGroup>
98100

99-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.5'">
101+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.5'" Label="Package References">
100102
<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
101103
<PackageReference Include="System.AppDomain" Version="2.0.11" />
102104
<PackageReference Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
@@ -114,14 +116,14 @@
114116
<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
115117
</ItemGroup>
116118

117-
<PropertyGroup Condition="'$(TargetFramework)' == 'portable46-net451+win81+wpa81'">
119+
<PropertyGroup Condition="'$(TargetFramework)' == 'portable46-net451+win81+wpa81'" Label="Build">
118120
<TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
119121
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
120122
<TargetFrameworkProfile>Profile151</TargetFrameworkProfile>
121123
<DefineConstants>$(DefineConstants);PORTABLE;SIGNED</DefineConstants>
122124
</PropertyGroup>
123125

124-
<ItemGroup Condition="'$(TargetFramework)' == 'portable46-net451+win81+wpa81'">
126+
<ItemGroup Condition="'$(TargetFramework)' == 'portable46-net451+win81+wpa81'" Label="Framework References">
125127
<Reference Include="Microsoft.CSharp" />
126128
<Reference Include="System" />
127129
<Reference Include="System.Collections" />
@@ -156,11 +158,11 @@
156158
<Reference Include="System.Xml.XDocument" />
157159
</ItemGroup>
158160

159-
<PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
161+
<PropertyGroup Condition="'$(TargetFramework)' == 'net45'" Label="Build">
160162
<DefineConstants>$(DefineConstants);NET45;SIGNED</DefineConstants>
161163
</PropertyGroup>
162164

163-
<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
165+
<ItemGroup Condition="'$(TargetFramework)' == 'net45'" Label="Framework References">
164166
<Reference Include="Microsoft.VisualBasic" />
165167
<Reference Include="System.Configuration" />
166168
<Reference Include="System.Data" />

0 commit comments

Comments
 (0)