Skip to content

Commit 6a42af7

Browse files
committed
Merge branch 'release-1.4.1'
2 parents 35f1b38 + cbe4da0 commit 6a42af7

File tree

4 files changed

+3
-17
lines changed

4 files changed

+3
-17
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,4 @@ Resources
5151
* [Code](http://github.com/getsentry/raven-csharp)
5252
* [Mailing List](https://groups.google.com/group/getsentry)
5353
* [IRC](irc://irc.freenode.net/sentry) (irc.freenode.net, #sentry)
54+

src/Build.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ echo =====================
2929
echo === NuGet Pack ===
3030
echo =====================
3131
echo.
32-
NuGet pack app\SharpRaven\SharpRaven.nuspec -Properties ReleaseInfo='Test'
32+
NuGet pack app\SharpRaven\SharpRaven.csproj -Properties ReleaseNotes='Test'
3333
echo.
3434
ENDLOCAL

src/app/SharpRaven/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,4 @@
4242
[assembly : AssemblyCulture("")]
4343
[assembly : ComVisible(false)]
4444
[assembly : Guid("b5683941-1254-484e-b074-87cedd4fc78e")]
45-
46-
// AssemblyVersion the most formal version number and is akin to "API Version". It doesn't need to change unless there's breaking changes.
47-
48-
[assembly : AssemblyVersion("1.0.0.0")]
49-
50-
// AssemblyFileVersion is more informal and can be increased more rapidly and with less consideration than AssemblyVersion.
51-
52-
[assembly : AssemblyFileVersion("1.0.0.0")]
53-
54-
// AssemblyInformationalVersion is even more informal than AssemblyFileVersion and doesn't need a certain format. It will be used as the $version$ replacement string in NuGet and can contain suffixes like "-alpha".
55-
// [assembly: AssemblyInformationalVersion("0.8.0.0")]
56-
5745
[assembly : InternalsVisibleTo("SharpRaven.UnitTests")]

src/app/SharpRaven/SharpRaven.nuspec

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@
1515
<copyright>Copyright 2014 The Sentry Team and individual contributors</copyright>
1616
<tags>raven sentry logging</tags>
1717
<dependencies>
18-
<dependency id="Newtonsoft.Json" version="6.0.5" />
18+
<dependency id="Newtonsoft.Json" version="6.0.6" />
1919
</dependencies>
2020
</metadata>
21-
<files>
22-
<file src="bin\Release\**\SharpRaven.*" target="lib" />
23-
</files>
2421
</package>

0 commit comments

Comments
 (0)