Skip to content

Commit fa8a479

Browse files
markcowlmarkcowl
authored
Merge pull request #47 from Azure/nsoft9
Allow NetCore packages to depend on Newtonsoft.Json 9
2 parents c584435 + 4085778 commit fa8a479

29 files changed

+52
-63
lines changed

‎build/sign.proj

+3-2
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,11 @@
4040
<Target Name="netstandard20">
4141
<Message Importance="high" Text="Sign: netstandard20 started" />
4242
<PropertyGroup>
43-
<OutputDir>$(Artifacts)$(Configuration)\netstandard2.0\</OutputDir>
43+
<OutputDir>$(Artifacts)$(Configuration)</OutputDir>
4444
</PropertyGroup>
4545
<ItemGroup>
46-
<NetStandard20Files Include="$(OutputDir)Microsoft.Azure.PowerShell*.dll" Exclude="$(OutputDir)Microsoft.Azure.PowerShell*.Test.dll" />
46+
<NetStandard20Files Include="$(OutputDir)\netstandard2.0\Microsoft.Azure.PowerShell*.dll" Exclude="$(OutputDir)\netstandard2.0\Microsoft.Azure.PowerShell*.Test.dll" />
47+
<NetStandard20Files Include="$(OutputDir)\netcoreapp2.1\Microsoft.Azure.PowerShell*.dll" Exclude="$(OutputDir)\netcoreapp2.1\Microsoft.Azure.PowerShell*.Test.dll" />
4748
</ItemGroup>
4849
<CodeSigningTask
4950
Description="$(Description)"

‎local-packages/Hyak.Common.1.2.0.nupkg

-78.6 KB
Binary file not shown.

‎local-packages/Hyak.Common.1.2.1.nupkg

80.9 KB
Binary file not shown.

‎local-packages/Microsoft.Azure.Common.2.2.0.nupkg

2.23 KB
Binary file not shown.

‎local-packages/Microsoft.Azure.Test.HttpRecorder.1.14.0.nupkg

65.4 KB
Binary file not shown.

‎local-packages/Microsoft.Azure.Test.HttpRecorder.1.14.0.symbols.nupkg

81.9 KB
Binary file not shown.

‎local-packages/Microsoft.Azure.Test.HttpRecorder.1.9.0.nupkg

-40 KB
Binary file not shown.

‎local-packages/Microsoft.Azure.Test.HttpRecorder.1.9.0.symbols.nupkg

-47.4 KB
Binary file not shown.

‎local-packages/Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.8.0.nupkg

79.3 KB
Binary file not shown.

‎local-packages/Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.8.0.symbols.nupkg

95.8 KB
Binary file not shown.

‎local-packages/Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.9.0.nupkg

-56.4 KB
Binary file not shown.

‎local-packages/Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.9.0.symbols.nupkg

-67 KB
Binary file not shown.

‎src/Aks/Aks.Netcore.csproj

-5
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@
3434
<DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
3535
</PropertyGroup>
3636

37-
<ItemGroup>
38-
<ProjectReference Include="..\Common\Common.Netcore.csproj" />
39-
<ProjectReference Include="..\ResourceManager\ResourceManager.Netcore.csproj" />
40-
</ItemGroup>
41-
4237
<ItemGroup>
4338
<Compile Update="Properties\Resources.Designer.cs">
4439
<DesignTime>true</DesignTime>

‎src/Authentication.Abstractions/Authentication.Abstractions.Netcore.csproj

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3+
<PropertyGroup>
4+
<IncludeHyak>true</IncludeHyak>
5+
</PropertyGroup>
36
<Import Project="$(ProjectDir)..\Dependencies.Netcore.targets" />
47

58
<PropertyGroup>
@@ -35,7 +38,7 @@
3538
</PropertyGroup>
3639

3740
<ItemGroup>
38-
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.4.0" />
41+
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.3.4" />
3942
</ItemGroup>
4043

4144
<ItemGroup>

‎src/Authentication.Abstractions/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40" />
99
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net45" />
1010
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
11-
<package id="Microsoft.Rest.ClientRuntime" version="2.3.12" targetFramework="net452" />
12-
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.13" targetFramework="net452" />
11+
<package id="Microsoft.Rest.ClientRuntime" version="2.3.13" targetFramework="net452" />
12+
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.15" targetFramework="net452" />
1313
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.3.1" targetFramework="net452" />
1414
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.0" targetFramework="net45" />
1515
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net40" />

‎src/Authentication/Authentication.Netcore.csproj

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3+
<PropertyGroup>
4+
<IncludeHyak>true</IncludeHyak>
5+
</PropertyGroup>
6+
37
<Import Project="$(ProjectDir)..\Dependencies.Netcore.targets" />
48

59
<PropertyGroup>

‎src/Authorization/Authorization.Netcore.csproj

-5
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@
3434
<DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
3535
</PropertyGroup>
3636

37-
<ItemGroup>
38-
<ProjectReference Include="..\Common\Common.Netcore.csproj" />
39-
<ProjectReference Include="..\ResourceManager\ResourceManager.Netcore.csproj" />
40-
</ItemGroup>
41-
4237
<ItemGroup>
4338
<Compile Update="Properties\Resources.Designer.cs">
4439
<DesignTime>true</DesignTime>

‎src/Common/Common.Netcore.csproj

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3+
<PropertyGroup>
4+
<IncludeHyak>true</IncludeHyak>
5+
</PropertyGroup>
36
<Import Project="$(ProjectDir)..\Dependencies.Netcore.targets" />
47

58
<PropertyGroup>

‎src/Compute/Compute.Netcore.csproj

-5
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@
3434
<DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
3535
</PropertyGroup>
3636

37-
<ItemGroup>
38-
<ProjectReference Include="..\Common\Common.Netcore.csproj" />
39-
<ProjectReference Include="..\ResourceManager\ResourceManager.Netcore.csproj" />
40-
</ItemGroup>
41-
4237
<ItemGroup>
4338
<Compile Remove="Properties\AssemblyInfo.cs" />
4439
<EmbeddedResource Remove="Properties\AssemblyInfo.cs" />

‎src/Dependencies.Netcore.targets

+13-7
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<IncludeSource>True</IncludeSource>
5+
<IncludeSymbols>True</IncludeSymbols>
6+
</PropertyGroup>
7+
<ItemGroup Condition="'$(OmitJsonPackage)' != 'true'">
8+
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
9+
</ItemGroup>
310
<ItemGroup>
4-
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.4.0" />
5-
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.4.0" />
11+
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.13" />
12+
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.3.15" />
613
</ItemGroup>
714
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
8-
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.4.0" />
9-
<PackageReference Include="Microsoft.Azure.Common" Version="2.2.0" />
10-
<PackageReference Include="Hyak.Common" Version="1.2.0" />
1115
<PackageReference Include="PowerShellStandard.Library" Version="5.1.0-preview-06" PrivateAssets="All" />
1216
</ItemGroup>
13-
<ItemGroup Condition="'$(OmitJsonPackage)' != 'true'">
14-
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
17+
<ItemGroup Condition="'$(IncludeHyak)' == 'true'">
18+
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.4.0" />
19+
<PackageReference Include="Microsoft.Azure.Common" Version="2.2.0" />
20+
<PackageReference Include="Hyak.Common" Version="1.2.1" />
1521
</ItemGroup>
1622
</Project>

‎src/Dependencies.Runtime.targets

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
<HintPath>$(PackagesDirectory)Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
1616
</Reference>
1717
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
18-
<HintPath>$(PackagesDirectory)Microsoft.Rest.ClientRuntime.2.3.12\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
18+
<HintPath>$(PackagesDirectory)Microsoft.Rest.ClientRuntime.2.3.13\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
1919
</Reference>
2020
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
21-
<HintPath>$(PackagesDirectory)Microsoft.Rest.ClientRuntime.Azure.3.3.13\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
21+
<HintPath>$(PackagesDirectory)Microsoft.Rest.ClientRuntime.Azure.3.3.15\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
2222
</Reference>
2323
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
2424
<HintPath>$(PackagesDirectory)Microsoft.Rest.ClientRuntime.Azure.Authentication.2.3.1\lib\net452\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>

‎src/Dependencies.Test.Netcore.targets

+8-6
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,17 @@
66
<Import Project="$(MSBuildThisFileDirectory)\Dependencies.Netcore.targets" />
77
<ItemGroup>
88
<PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="1.9.0-preview" />
9-
<PackageReference Include="Microsoft.Azure.Test.HttpRecorder" Version="1.9.0" />
10-
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.4.0" />
11-
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version="1.9.0" />
9+
<PackageReference Include="Microsoft.Azure.Test.HttpRecorder" Version="1.14.0" />
10+
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.3.4" />
11+
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version="1.8.0" />
1212
<PackageReference Include="xunit" Version="2.4.0" />
13-
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
1413
</ItemGroup>
15-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
14+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
1615
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
17-
<PackageReference Include="Microsoft.PowerShell.SDK" Version="6.1.0-preview.3" IncludeAssets="All" />
16+
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
17+
</ItemGroup>
18+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
1819
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
20+
<PackageReference Include="Microsoft.PowerShell.SDK" Version="6.1.0-preview.3" IncludeAssets="All" />
1921
</ItemGroup>
2022
</Project>

‎src/Graph.Rbac/Graph.Rbac.Netcore.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
</PropertyGroup>
3636

3737
<ItemGroup>
38+
<ProjectReference Include="..\Authentication.Abstractions\Authentication.Abstractions.Netcore.csproj" />
3839
<ProjectReference Include="..\Common\Common.Netcore.csproj" />
3940
<ProjectReference Include="..\ResourceManager\ResourceManager.Netcore.csproj" />
4041
</ItemGroup>

‎src/KeyVault/KeyVault.Netcore.csproj

-6
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,6 @@
4343
<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
4444
</ItemGroup>
4545

46-
<ItemGroup>
47-
<ProjectReference Include="..\Authentication.Abstractions\Authentication.Abstractions.Netcore.csproj" />
48-
<ProjectReference Include="..\ResourceManager\ResourceManager.Netcore.csproj" />
49-
<ProjectReference Include="..\Common\Common.Netcore.csproj" />
50-
</ItemGroup>
51-
5246
<ItemGroup>
5347
<Compile Remove="Properties\AssemblyInfo.cs" />
5448
<EmbeddedResource Remove="Properties\AssemblyInfo.cs" />

‎src/Network/Network.Netcore.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
</PropertyGroup>
3636

3737
<ItemGroup>
38+
<ProjectReference Include="..\Authentication.Abstractions\Authentication.Abstractions.Netcore.csproj" />
3839
<ProjectReference Include="..\Common\Common.Netcore.csproj" />
39-
<ProjectReference Include="..\ResourceManager\ResourceManager.Netcore.csproj" />
4040
</ItemGroup>
4141

4242
<ItemGroup>

‎src/ScenarioTest.ResourceManager/ScenarioTest.ResourceManager.Netcore.csproj

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<IncludeHyak>true</IncludeHyak>
4+
</PropertyGroup>
25

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

‎src/Storage.Management/Storage.Management.Netcore.csproj

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
2+
<PropertyGroup>
3+
<OmitJsonPackage>true</OmitJsonPackage>
4+
</PropertyGroup>
35
<Import Project="$(ProjectDir)..\Dependencies.Netcore.targets" />
46

57
<PropertyGroup>
@@ -36,8 +38,6 @@
3638
</PropertyGroup>
3739

3840
<ItemGroup>
39-
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="7.1.0-preview" />
40-
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
4141
<PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" />
4242
</ItemGroup>
4343

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

65-
<ItemGroup>
66-
<ProjectReference Include="..\Authentication.Abstractions\Authentication.Abstractions.Netcore.csproj" />
67-
<ProjectReference Include="..\Common\Common.Netcore.csproj" />
68-
</ItemGroup>
69-
7065
<ItemGroup>
7166
<Compile Remove="Properties\AssemblyInfo.cs" />
7267
<EmbeddedResource Remove="Properties\AssemblyInfo.cs" />

‎src/Storage/Storage.Netcore.csproj

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<OmitJsonPackage>true</OmitJsonPackage>
4+
</PropertyGroup>
25

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

@@ -37,11 +40,6 @@
3740
<DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
3841
</PropertyGroup>
3942

40-
<ItemGroup>
41-
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="7.1.0-preview" />
42-
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
43-
</ItemGroup>
44-
4543
<ItemGroup>
4644
<Compile Remove="Adapters\**" />
4745
<EmbeddedResource Remove="Adapters\**" />
@@ -53,7 +51,6 @@
5351

5452
<ItemGroup>
5553
<ProjectReference Include="..\Authentication.Abstractions\Authentication.Abstractions.Netcore.csproj" />
56-
<ProjectReference Include="..\Common\Common.Netcore.csproj" />
5754
</ItemGroup>
5855

5956
<ItemGroup>
@@ -78,4 +75,4 @@
7875
<Content Remove="Properties\AssemblyInfo.cs" />
7976
</ItemGroup>
8077

81-
</Project>
78+
</Project>

‎src/Websites/Websites.Netcore.csproj

+1-6
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,14 @@
3434
<DelaySign>false</DelaySign>
3535
</PropertyGroup>
3636

37-
<ItemGroup >
37+
<ItemGroup>
3838
<PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
3939
<PackageReference Include="System.Reflection" Version="4.3.0" />
4040
<PackageReference Include="System.Security.SecureString" Version="4.3.0" />
4141
<PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
4242
<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
4343
</ItemGroup>
4444

45-
<ItemGroup>
46-
<ProjectReference Include="..\Common\Common.Netcore.csproj" />
47-
<ProjectReference Include="..\ResourceManager\ResourceManager.Netcore.csproj" />
48-
</ItemGroup>
49-
5045
<ItemGroup>
5146
<Compile Remove="Properties\AssemblyInfo.cs" />
5247
<EmbeddedResource Remove="Properties\AssemblyInfo.cs" />

0 commit comments

Comments
 (0)