Skip to content
This repository has been archived by the owner on Jan 19, 2021. It is now read-only.

Commit

Permalink
Merge pull request #1293 from SharePoint/dev
Browse files Browse the repository at this point in the history
December 2017 Intermediate Release 2
  • Loading branch information
erwinvanhunen authored Dec 12, 2017
2 parents d8bdc49 + e8b5b97 commit 2d00bfb
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Commands/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.21.1712.1")]
[assembly: AssemblyFileVersion("2.21.1712.1")]
[assembly: AssemblyVersion("2.21.1712.2")]
[assembly: AssemblyFileVersion("2.21.1712.2")]
[assembly: InternalsVisibleTo("SharePointPnP.PowerShell.Tests")]
7 changes: 5 additions & 2 deletions Commands/SharePointPnP.PowerShell.Commands.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -360,8 +360,8 @@
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SharePointPnP.IdentityModel.Extensions, Version=1.2.2.0, Culture=neutral, PublicKeyToken=3751622786b357c2, processorArchitecture=MSIL">
<HintPath>..\packages\SharePointPnP.IdentityModel.Extensions.1.2.2\lib\net45\SharePointPnP.IdentityModel.Extensions.dll</HintPath>
<Reference Include="SharePointPnP.IdentityModel.Extensions, Version=1.2.3.0, Culture=neutral, PublicKeyToken=5e633289e95c321a, processorArchitecture=MSIL">
<HintPath>..\packages\SharePointPnP.IdentityModel.Extensions.1.2.3\lib\net45\SharePointPnP.IdentityModel.Extensions.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="Microsoft.PowerShell.Commands.Management" />
Expand All @@ -373,6 +373,9 @@
<Private>False</Private>
</Reference>
<Reference Include="System.IdentityModel.Selectors" />
<Reference Include="System.IdentityModel.Tokens.Jwt, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\System.IdentityModel.Tokens.Jwt.4.0.0\lib\net45\System.IdentityModel.Tokens.Jwt.dll</HintPath>
</Reference>
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\System.Management.Automation.dll.10.0.10586.0\lib\net40\System.Management.Automation.dll</HintPath>
<Private>True</Private>
Expand Down
3 changes: 2 additions & 1 deletion Commands/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.29.0" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="1.8.0.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
<package id="SharePointPnP.IdentityModel.Extensions" version="1.2.2" targetFramework="net45" />
<package id="SharePointPnP.IdentityModel.Extensions" version="1.2.3" targetFramework="net45" />
<package id="System.ComponentModel" version="4.0.1" targetFramework="net45" />
<package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net45" />
<package id="System.Globalization" version="4.0.11" targetFramework="net45" />
<package id="System.IdentityModel.Tokens.Jwt" version="4.0.0" targetFramework="net45" />
<package id="System.Linq" version="4.1.0" targetFramework="net45" />
<package id="System.Linq.Expressions" version="4.1.0" targetFramework="net45" />
<package id="System.Management.Automation.dll" version="10.0.10586.0" targetFramework="net45" />
Expand Down

0 comments on commit 2d00bfb

Please sign in to comment.