Skip to content
This repository was archived by the owner on Aug 30, 2023. It is now read-only.

Commit 54d0e93

Browse files
asbjornuasbjornu
committed
Merge branch 'develop'
* develop: Upgraded Newtonsoft.Json from v6.0.6 to v6.0.8 Added Solution Items Added GitVersion config so 'develop' only increments the patch version and the versioning behavior of feature branches matches that of the 'develop' branch. Upgraded GitVersionTask from v1.3.3 to v3.0.2 Removed GitVersion.CommandLine and installed GitVersionTask in all projects. Adjusted assembly info. Removed NuGet in favor of Automatic Package Restore as of NuGet 2.7+. R# 9 settings migration
2 parents daa6542 + 6ae0085 commit 54d0e93

17 files changed

Lines changed: 63 additions & 254 deletions

File tree

‎.nuget/NuGet.Config‎

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

‎.nuget/NuGet.exe‎

-1.59 MB
Binary file not shown.

‎.nuget/NuGet.targets‎

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

‎GitVersionConfig.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
branches:
2+
feature[/-]:
3+
mode: ContinuousDeployment
4+
increment: Patch
5+
develop:
6+
increment: Patch

‎src/SharpRaven.sln‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,24 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 2013
3-
VisualStudioVersion = 12.0.31101.0
3+
VisualStudioVersion = 12.0.40418.0
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpRaven", "app\SharpRaven\SharpRaven.csproj", "{CC80A2E1-AE39-44DE-8DA3-4EEF42F90FB1}"
66
EndProject
77
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpRaven.UnitTests", "tests\SharpRaven.UnitTests\SharpRaven.UnitTests.csproj", "{E1DBEBBF-9448-4D99-B378-2B8CF1629F31}"
88
EndProject
99
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpRaven.WebTest", "tests\SharpRaven.WebTest\SharpRaven.WebTest.csproj", "{156621FC-2C48-4CDF-A368-9347BABE9089}"
1010
EndProject
11-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{8A88BBCD-89AC-4593-9B91-A93B9F305ED3}"
12-
ProjectSection(SolutionItems) = preProject
13-
..\.nuget\NuGet.Config = ..\.nuget\NuGet.Config
14-
..\.nuget\NuGet.exe = ..\.nuget\NuGet.exe
15-
..\.nuget\NuGet.targets = ..\.nuget\NuGet.targets
16-
EndProjectSection
17-
EndProject
1811
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{88CB5CD6-ACFA-441E-9FBB-E1E06F181B89}"
1912
EndProject
2013
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D2B3990A-A048-49F3-A697-A1DAEF82CE7F}"
2114
EndProject
2215
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BF6154D1-9BC4-4966-9506-BC33E81F317C}"
2316
ProjectSection(SolutionItems) = preProject
17+
..\.gitattributes = ..\.gitattributes
18+
..\.gitignore = ..\.gitignore
19+
..\.gitmodules = ..\.gitmodules
2420
Build.cmd = Build.cmd
21+
..\GitVersionConfig.yaml = ..\GitVersionConfig.yaml
2522
..\LICENSE = ..\LICENSE
2623
..\Makefile = ..\Makefile
2724
..\README.md = ..\README.md

‎src/SharpRaven.sln.DotSettings‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S
483483
<s:Boolean x:Key="/Default/Environment/GenerateMru/SortByName/=Constructor/@EntryIndexedValue">False</s:Boolean>
484484
<s:Boolean x:Key="/Default/Environment/GenerateMru/SortByName/=Implementations/@EntryIndexedValue">False</s:Boolean>
485485
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpFileLayoutPatternsUpgrade/@EntryIndexedValue">True</s:Boolean>
486+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
486487
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
487488
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
488489
<s:String x:Key="/Default/Environment/UserInterface/ShortcutSchemeName/@EntryValue">Idea</s:String>

‎src/app/SharpRaven/Properties/AssemblyInfo.cs‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,11 @@
3232
using System.Runtime.CompilerServices;
3333
using System.Runtime.InteropServices;
3434

35-
[assembly: AssemblyTitle("SharpRaven")]
36-
[assembly: AssemblyDescription("SharpRaven is a C# client for Sentry https://www.getsentry.com")]
37-
[assembly: AssemblyConfiguration("")]
38-
[assembly: AssemblyCompany("Sentry")]
39-
[assembly: AssemblyProduct("SharpRaven")]
40-
[assembly: AssemblyCopyright("Copyright © Sentry 2014")]
41-
[assembly: AssemblyTrademark("")]
42-
[assembly: AssemblyCulture("")]
43-
[assembly: ComVisible(false)]
44-
[assembly: Guid("b5683941-1254-484e-b074-87cedd4fc78e")]
45-
[assembly: InternalsVisibleTo("SharpRaven.UnitTests")]
35+
[assembly : AssemblyTitle("SharpRaven")]
36+
[assembly : AssemblyDescription("SharpRaven is a C# client for Sentry https://www.getsentry.com")]
37+
[assembly : AssemblyCompany("Sentry")]
38+
[assembly : AssemblyProduct("SharpRaven")]
39+
[assembly : AssemblyCopyright("Copyright © Sentry")]
40+
[assembly : ComVisible(false)]
41+
[assembly : Guid("b5683941-1254-484e-b074-87cedd4fc78e")]
42+
[assembly : InternalsVisibleTo("SharpRaven.UnitTests")]

‎src/app/SharpRaven/SharpRaven.csproj‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
16-
<RestorePackages>true</RestorePackages>
1716
<TargetFrameworkProfile />
18-
<NuGetPackageImportStamp>4140b34f</NuGetPackageImportStamp>
17+
<NuGetPackageImportStamp>74978b08</NuGetPackageImportStamp>
1918
</PropertyGroup>
2019
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug 4.0|AnyCPU' ">
2120
<DebugSymbols>true</DebugSymbols>
@@ -68,7 +67,7 @@
6867
<Reference Include="Microsoft.CSharp" />
6968
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
7069
<SpecificVersion>False</SpecificVersion>
71-
<HintPath>..\..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
70+
<HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
7271
</Reference>
7372
<Reference Include="System" />
7473
<Reference Include="System.Net.Http" Condition="$(Configuration) == 'Release 4.5' Or $(Configuration) == 'Debug 4.5'" />
@@ -106,12 +105,11 @@
106105
</None>
107106
</ItemGroup>
108107
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
109-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
110-
<Import Project="..\..\packages\GitVersionTask.1.3.3\Build\GitVersionTask.targets" Condition="Exists('..\..\packages\GitVersionTask.1.3.3\Build\GitVersionTask.targets')" />
108+
<Import Project="..\..\packages\GitVersionTask.3.0.2\Build\GitVersionTask.targets" Condition="Exists('..\..\packages\GitVersionTask.3.0.2\Build\GitVersionTask.targets')" />
111109
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
112110
<PropertyGroup>
113111
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
114112
</PropertyGroup>
115-
<Error Condition="!Exists('..\..\packages\GitVersionTask.1.3.3\Build\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\GitVersionTask.1.3.3\Build\GitVersionTask.targets'))" />
113+
<Error Condition="!Exists('..\..\packages\GitVersionTask.3.0.2\Build\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\GitVersionTask.3.0.2\Build\GitVersionTask.targets'))" />
116114
</Target>
117115
</Project>

‎src/app/SharpRaven/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="GitVersionTask" version="1.3.3" targetFramework="net45" developmentDependency="true" />
4-
<package id="Newtonsoft.Json" version="6.0.6" targetFramework="net40" />
3+
<package id="GitVersionTask" version="3.0.2" targetFramework="net45" developmentDependency="true" />
4+
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
55
</packages>

‎src/packages/repositories.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
<repositories>
33
<repository path="..\app\SharpRaven\packages.config" />
44
<repository path="..\tests\SharpRaven.UnitTests\packages.config" />
5+
<repository path="..\tests\SharpRaven.WebTest\packages.config" />
56
</repositories>

0 commit comments

Comments
 (0)