Skip to content

Commit e1d3e75

Browse files
Merge pull request #44 from microsoftgraph/mainer/bumpVersion
Bumped version -- will add strong name
2 parents 162c768 + 2b06626 commit e1d3e75

File tree

7 files changed

+19
-9
lines changed

7 files changed

+19
-9
lines changed

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ supported authentication portals:
3232
* [Microsoft Azure Active Directory](https://manage.windowsazure.com): Register
3333
a new application in your tenant's Active Directory to support work or school
3434
users for your tenant or multiple tenants.
35-
35+
3636
### 2. Authenticate for the Microsoft Graph service
3737

3838
The Microsoft Graph .NET Client Library does not include any default authentication implementations.
@@ -90,6 +90,10 @@ The following sample applications are also available:
9090
* [Microsoft Graph API](https://graph.microsoft.io)
9191
* [Release notes](https://github.com/microsoftgraph/msgraph-sdk-dotnet/releases/tag/1.1.0)
9292

93+
## Notes
94+
95+
Install NewtonSoft.Json first if you want to use a version greater than NewtonSoft.Json 6.0.1. For example, you'll need to install NewtonSoft.Json 9.0.1 first if you want to use this to library while targeting .Net Core with standard1.0.
96+
9397
## Issues
9498

9599
To view or log issues, see [issues](https://github.com/microsoftgraph/msgraph-sdk-dotnet/issues).

src/Microsoft.Graph.Core/Microsoft.Graph.Core.nuspec

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
<projectUrl>https://graph.microsoft.io</projectUrl>
1414
<licenseUrl>http://aka.ms/devservicesagreement</licenseUrl>
1515
<tags>Microsoft Office365 Graph GraphServiceClient Outlook OneDrive AzureAD GraphAPI Productivity SharePoint SDK</tags>
16+
<dependencies>
17+
<dependency id="Newtonsoft.Json" version="[6.0.1,10)" />
18+
</dependencies>
1619
</metadata>
1720
<files>
1821
<!-- This dependency comes from packages.config-->

src/Microsoft.Graph.Core/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
//
2525
// You can specify all the values or you can default the Build and Revision Numbers
2626
// by using the '*' as shown below:
27-
[assembly: AssemblyVersion("1.2.0")]
28-
[assembly: AssemblyFileVersion("1.2.0.0")]
27+
[assembly: AssemblyVersion("1.2.1")]
28+
[assembly: AssemblyFileVersion("1.2.1.0")]
2929

3030
#if DEBUG
3131
[assembly: InternalsVisibleTo("Microsoft.Graph.Core.Test")]
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="portable45-net45+win8+wpa81" />
3+
<package id="Newtonsoft.Json" version="6.0.1" targetFramework="portable45-net45+win8+wpa81" />
44
</packages>

src/Microsoft.Graph/Microsoft.Graph.nuspec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<copyright>Copyright (c) Microsoft Corporation</copyright>
1313
<projectUrl>https://graph.microsoft.io</projectUrl>
1414
<licenseUrl>http://aka.ms/devservicesagreement</licenseUrl>
15-
<releaseNotes>## September 2016 Release Summary (version 1.1.0)
15+
<releaseNotes>## September 2016 Release Summary (version 1.1.1)
1616

1717
We've got a new addition to the .Net Microsoft Graph client API family. Excel files stored in OneDrive can now be accessed from .Net applications. We've refactored the base classes to be included in the Microsoft.Graph.Core assembly so that custom clients can target specific workloads. Here are the changes made with this release.
1818

@@ -35,6 +35,9 @@ This will support workload specific client libraries.
3535
* Updated to use NewtonSoft 9.0.1 from 6.0.2. Tested. Set allowed package version range to greater than or equal to 9 and less than 10.
3636
* Updated the data contracts to only use NewtonSoft.</releaseNotes>
3737
<tags>Microsoft Office365 Graph GraphServiceClient Outlook OneDrive AzureAD GraphAPI Productivity SharePoint SDK</tags>
38+
<dependencies>
39+
<dependency id="Newtonsoft.Json" version="[6.0.1,10)" />
40+
</dependencies>
3841
</metadata>
3942
<files>
4043
<!-- This dependency comes from packages.config-->

src/Microsoft.Graph/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
//
2525
// You can specify all the values or you can default the Build and Revision Numbers
2626
// by using the '*' as shown below:
27-
[assembly: AssemblyVersion("1.1.0")]
28-
[assembly: AssemblyFileVersion("1.1.0.0")]
27+
[assembly: AssemblyVersion("1.1.1")]
28+
[assembly: AssemblyFileVersion("1.1.1.0")]
2929

3030
#if DEBUG
3131
[assembly: InternalsVisibleTo("Microsoft.Graph.Test")]
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="Newtonsoft.Json" version="9.0.1" targetFramework="portable45-net45+win8+wpa81" />
4-
<package id="Microsoft.Graph.Core" version="1.2" />
3+
<package id="Newtonsoft.Json" version="6.0.1" targetFramework="portable45-net45+win8+wpa81" />
4+
<package id="Microsoft.Graph.Core" version="1.2.1" />
55
</packages>

0 commit comments

Comments
 (0)