Skip to content

Allow NetCore packages to depend on Newtonsoft.Json 9 #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Sep 13, 2018
Merged

Allow NetCore packages to depend on Newtonsoft.Json 9 #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
4b8a840
Downgrading package versions
markcowl Aug 24, 2018
622afd4
More adjustments
markcowl Aug 24, 2018
9795ad7
Updating autnentication library
markcowl Aug 24, 2018
3457952
Omit newtonsoft.json from storage manageemnt package
markcowl Aug 27, 2018
70931de
Simplify dependencies to use newtonsoft 9 and 10
markcowl Aug 28, 2018
f5a5cbd
Updating for Hyak with Newtonsoft.Json 9 dependency
markcowl Aug 28, 2018
4da1b71
Allow signing netcoreapp2.1 builds
markcowl Aug 28, 2018
4b23ecd
Merging with upstream changes
markcowl Aug 30, 2018
8bec4b1
Update exception for newtonsoft issue
markcowl Aug 31, 2018
9dd8d77
Changing newtonsoft dependency for authentication package
markcowl Aug 31, 2018
bdb31ad
Back to 9
markcowl Aug 31, 2018
43b75bc
Updating test framework dependencies
markcowl Sep 4, 2018
07b3584
Merging with upstream
markcowl Sep 10, 2018
853a47c
Removing test changes and fixing formatting
markcowl Sep 10, 2018
994d8cf
Merge pull request #46 from markcowl/nsoft9
markcowl Sep 10, 2018
ee0c338
Merge branch 'develop' into nsoft9
markcowl Sep 10, 2018
4b2022e
Updating net framework dependencies
markcowl Sep 11, 2018
682ba08
Merge branch 'nsoft9' of github.com:azure/azure-powershell-common int…
markcowl Sep 11, 2018
94efd21
Merge pull request #49 from markcowl/nsoft9
markcowl Sep 11, 2018
1957f7e
Merge branch 'develop' into nsoft9
markcowl Sep 13, 2018
b1d8610
Merge branch 'develop' into nsoft9
markcowl Sep 13, 2018
c429c51
Respond to review comments
markcowl Sep 13, 2018
4085778
Fix property tag
markcowl Sep 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions build/sign.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,11 @@
<Target Name="netstandard20">
<Message Importance="high" Text="Sign: netstandard20 started" />
<PropertyGroup>
<OutputDir>$(Artifacts)$(Configuration)\netstandard2.0\</OutputDir>
<OutputDir>$(Artifacts)$(Configuration)</OutputDir>
</PropertyGroup>
<ItemGroup>
<NetStandard20Files Include="$(OutputDir)Microsoft.Azure.PowerShell*.dll" Exclude="$(OutputDir)Microsoft.Azure.PowerShell*.Test.dll" />
<NetStandard20Files Include="$(OutputDir)\netstandard2.0\Microsoft.Azure.PowerShell*.dll" Exclude="$(OutputDir)\netstandard2.0\Microsoft.Azure.PowerShell*.Test.dll" />
<NetStandard20Files Include="$(OutputDir)\netcoreapp2.1\Microsoft.Azure.PowerShell*.dll" Exclude="$(OutputDir)\netcoreapp2.1\Microsoft.Azure.PowerShell*.Test.dll" />
</ItemGroup>
<CodeSigningTask
Description="$(Description)"
Expand Down
Binary file removed local-packages/Hyak.Common.1.2.0.nupkg
View file
Open in desktop
Binary file not shown.
Binary file added local-packages/Hyak.Common.1.2.1.nupkg
View file
Open in desktop
Binary file not shown.
Binary file modified local-packages/Microsoft.Azure.Common.2.2.0.nupkg
View file
Open in desktop
Binary file not shown.
Binary file added local-packages/Microsoft.Azure.Test.HttpRecorder.1.14.0.nupkg
View file
Open in desktop
Binary file not shown.
Binary file added local-packages/Microsoft.Azure.Test.HttpRecorder.1.14.0.symbols.nupkg
View file
Open in desktop
Binary file not shown.
Binary file removed local-packages/Microsoft.Azure.Test.HttpRecorder.1.9.0.nupkg
View file
Open in desktop
Binary file not shown.
Binary file removed local-packages/Microsoft.Azure.Test.HttpRecorder.1.9.0.symbols.nupkg
View file
Open in desktop
Binary file not shown.
Binary file added local-packages/Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.8.0.nupkg
View file
Open in desktop
Binary file not shown.
Binary file added local-packages/Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.8.0.symbols.nupkg
View file
Open in desktop
Binary file not shown.
Binary file removed local-packages/Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.9.0.nupkg
View file
Open in desktop
Binary file not shown.
Binary file removed local-packages/Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.9.0.symbols.nupkg
View file
Open in desktop
Binary file not shown.
5 changes: 0 additions & 5 deletions src/Aks/Aks.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,6 @@
<DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Common\Common.Netcore.csproj" />
<ProjectReference Include="..\ResourceManager\ResourceManager.Netcore.csproj" />
</ItemGroup>

<ItemGroup>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>true</DesignTime>
Expand Down
5 changes: 4 additions & 1 deletion src/Authentication.Abstractions/Authentication.Abstractions.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<IncludeHyak>true</IncludeHyak>
</PropertyGroup>
<Import Project="$(ProjectDir)..\Dependencies.Netcore.targets" />

<PropertyGroup>
Expand Down Expand Up @@ -35,7 +38,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.4.0" />
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.3.4" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Authentication.Abstractions/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40" />
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net45" />
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
<package id="Microsoft.Rest.ClientRuntime" version="2.3.12" targetFramework="net452" />
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.13" targetFramework="net452" />
<package id="Microsoft.Rest.ClientRuntime" version="2.3.13" targetFramework="net452" />
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.15" targetFramework="net452" />
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.3.1" targetFramework="net452" />
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.0" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net40" />
Expand Down
4 changes: 4 additions & 0 deletions src/Authentication/Authentication.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<IncludeHyak>true</IncludeHyak>
</PropertyGroup>

<Import Project="$(ProjectDir)..\Dependencies.Netcore.targets" />

<PropertyGroup>
Expand Down
5 changes: 0 additions & 5 deletions src/Authorization/Authorization.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,6 @@
<DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Common\Common.Netcore.csproj" />
<ProjectReference Include="..\ResourceManager\ResourceManager.Netcore.csproj" />
</ItemGroup>

<ItemGroup>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>true</DesignTime>
Expand Down
3 changes: 3 additions & 0 deletions src/Common/Common.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<IncludeHyak>true</IncludeHyak>
</PropertyGroup>
<Import Project="$(ProjectDir)..\Dependencies.Netcore.targets" />

<PropertyGroup>
Expand Down
5 changes: 0 additions & 5 deletions src/Compute/Compute.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,6 @@
<DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Common\Common.Netcore.csproj" />
<ProjectReference Include="..\ResourceManager\ResourceManager.Netcore.csproj" />
</ItemGroup>

<ItemGroup>
<Compile Remove="Properties\AssemblyInfo.cs" />
<EmbeddedResource Remove="Properties\AssemblyInfo.cs" />
Expand Down
20 changes: 13 additions & 7 deletions src/Dependencies.Netcore.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<IncludeSource>True</IncludeSource>
<IncludeSymbols>True</IncludeSymbols>
</PropertyGroup>
<ItemGroup Condition="'$(OmitJsonPackage)' != 'true'">
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.4.0" />
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.4.0" />
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.13" />
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.3.15" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.4.0" />
<PackageReference Include="Microsoft.Azure.Common" Version="2.2.0" />
<PackageReference Include="Hyak.Common" Version="1.2.0" />
<PackageReference Include="PowerShellStandard.Library" Version="5.1.0-preview-06" PrivateAssets="All" />
</ItemGroup>
<ItemGroup Condition="'$(OmitJsonPackage)' != 'true'">
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<ItemGroup Condition="'$(IncludeHyak)' == 'true'">
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.4.0" />
<PackageReference Include="Microsoft.Azure.Common" Version="2.2.0" />
<PackageReference Include="Hyak.Common" Version="1.2.1" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions src/Dependencies.Runtime.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
<HintPath>$(PackagesDirectory)Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>$(PackagesDirectory)Microsoft.Rest.ClientRuntime.2.3.12\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
<HintPath>$(PackagesDirectory)Microsoft.Rest.ClientRuntime.2.3.13\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>$(PackagesDirectory)Microsoft.Rest.ClientRuntime.Azure.3.3.13\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
<HintPath>$(PackagesDirectory)Microsoft.Rest.ClientRuntime.Azure.3.3.15\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>$(PackagesDirectory)Microsoft.Rest.ClientRuntime.Azure.Authentication.2.3.1\lib\net452\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
Expand Down
14 changes: 8 additions & 6 deletions src/Dependencies.Test.Netcore.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,17 @@
<Import Project="$(MSBuildThisFileDirectory)\Dependencies.Netcore.targets" />
<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="1.9.0-preview" />
<PackageReference Include="Microsoft.Azure.Test.HttpRecorder" Version="1.9.0" />
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.4.0" />
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version="1.9.0" />
<PackageReference Include="Microsoft.Azure.Test.HttpRecorder" Version="1.14.0" />
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.3.4" />
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version="1.8.0" />
<PackageReference Include="xunit" Version="2.4.0" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
<PackageReference Include="Microsoft.PowerShell.SDK" Version="6.1.0-preview.3" IncludeAssets="All" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
<PackageReference Include="Microsoft.PowerShell.SDK" Version="6.1.0-preview.3" IncludeAssets="All" />
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions src/Graph.Rbac/Graph.Rbac.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Authentication.Abstractions\Authentication.Abstractions.Netcore.csproj" />
<ProjectReference Include="..\Common\Common.Netcore.csproj" />
<ProjectReference Include="..\ResourceManager\ResourceManager.Netcore.csproj" />
</ItemGroup>
Expand Down
6 changes: 0 additions & 6 deletions src/KeyVault/KeyVault.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,6 @@
<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Authentication.Abstractions\Authentication.Abstractions.Netcore.csproj" />
<ProjectReference Include="..\ResourceManager\ResourceManager.Netcore.csproj" />
<ProjectReference Include="..\Common\Common.Netcore.csproj" />
</ItemGroup>

<ItemGroup>
<Compile Remove="Properties\AssemblyInfo.cs" />
<EmbeddedResource Remove="Properties\AssemblyInfo.cs" />
Expand Down
2 changes: 1 addition & 1 deletion src/Network/Network.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Authentication.Abstractions\Authentication.Abstractions.Netcore.csproj" />
<ProjectReference Include="..\Common\Common.Netcore.csproj" />
<ProjectReference Include="..\ResourceManager\ResourceManager.Netcore.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 3 additions & 0 deletions src/ScenarioTest.ResourceManager/ScenarioTest.ResourceManager.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<IncludeHyak>true</IncludeHyak>
</PropertyGroup>

<Import Project="$(ProjectDir)..\Dependencies.Test.Netcore.targets" />

Expand Down
11 changes: 3 additions & 8 deletions src/Storage.Management/Storage.Management.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OmitJsonPackage>true</OmitJsonPackage>
</PropertyGroup>
<Import Project="$(ProjectDir)..\Dependencies.Netcore.targets" />

<PropertyGroup>
Expand Down Expand Up @@ -36,8 +38,6 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="7.1.0-preview" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are these being removed?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because they are not actually used in the package. We use these dependencies to control the storage version used in the modules, I am instead moving these into the azure-powershell common dependcies just for those packages that need them. This is necessary to allow building cmdlets and cmdlet test packages that depend on newtonsoft.json 9

<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
<PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" />
</ItemGroup>

Expand All @@ -62,11 +62,6 @@
<None Remove="Stack\packages.config" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Authentication.Abstractions\Authentication.Abstractions.Netcore.csproj" />
<ProjectReference Include="..\Common\Common.Netcore.csproj" />
</ItemGroup>

<ItemGroup>
<Compile Remove="Properties\AssemblyInfo.cs" />
<EmbeddedResource Remove="Properties\AssemblyInfo.cs" />
Expand Down
11 changes: 4 additions & 7 deletions src/Storage/Storage.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OmitJsonPackage>true</OmitJsonPackage>
</PropertyGroup>

<Import Project="$(ProjectDir)..\Dependencies.Netcore.targets" />

Expand Down Expand Up @@ -37,11 +40,6 @@
<DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="7.1.0-preview" />
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
</ItemGroup>

<ItemGroup>
<Compile Remove="Adapters\**" />
<EmbeddedResource Remove="Adapters\**" />
Expand All @@ -53,7 +51,6 @@

<ItemGroup>
<ProjectReference Include="..\Authentication.Abstractions\Authentication.Abstractions.Netcore.csproj" />
<ProjectReference Include="..\Common\Common.Netcore.csproj" />
</ItemGroup>

<ItemGroup>
Expand All @@ -78,4 +75,4 @@
<Content Remove="Properties\AssemblyInfo.cs" />
</ItemGroup>

</Project>
</Project>
7 changes: 1 addition & 6 deletions src/Websites/Websites.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,14 @@
<DelaySign>false</DelaySign>
</PropertyGroup>

<ItemGroup >
<ItemGroup>
<PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
<PackageReference Include="System.Reflection" Version="4.3.0" />
<PackageReference Include="System.Security.SecureString" Version="4.3.0" />
<PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Common\Common.Netcore.csproj" />
<ProjectReference Include="..\ResourceManager\ResourceManager.Netcore.csproj" />
</ItemGroup>

<ItemGroup>
<Compile Remove="Properties\AssemblyInfo.cs" />
<EmbeddedResource Remove="Properties\AssemblyInfo.cs" />
Expand Down