Skip to content

Commit 112e5b6

Browse files
committed
Simlify dependency targets
1 parent 6774c08 commit 112e5b6

File tree

3 files changed

+33
-34
lines changed

3 files changed

+33
-34
lines changed

tools/Common.Netcore.Dependencies.Shared.targets

Lines changed: 0 additions & 32 deletions
This file was deleted.

tools/Common.Netcore.Dependencies.Test.targets

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildThisFileDirectory)\Common.Netcore.Dependencies.Shared.targets" />
3+
<PropertyGroup>
4+
<OmitJsonPackage>true</OmitJsonPackage>
5+
</PropertyGroup>
6+
<Import Project="$(MSBuildThisFileDirectory)\Common.Netcore.Dependencies.targets" />
47
<ItemGroup>
58
<PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="1.9.0-preview" />
69
<PackageReference Include="Microsoft.Azure.Test.HttpRecorder" Version="1.9.0" />
Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,35 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildThisFileDirectory)\Common.Netcore.Dependencies.Shared.targets" />
43
<ItemGroup>
4+
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.4.0" />
5+
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.4.0" />
6+
<PackageReference Include="Microsoft.Azure.PowerShell.Aks" Version="1.0.0" />
7+
<PackageReference Include="Microsoft.Azure.PowerShell.Authentication" Version="1.0.0" />
8+
<PackageReference Include="Microsoft.Azure.PowerShell.Authentication.Abstractions" Version="1.0.0" />
9+
<PackageReference Include="Microsoft.Azure.PowerShell.Authentication.ResourceManager" Version="1.0.0" />
10+
<PackageReference Include="Microsoft.Azure.PowerShell.Authorization" Version="1.0.0" />
11+
<PackageReference Include="Microsoft.Azure.PowerShell.Common" Version="1.0.0" />
12+
<PackageReference Include="Microsoft.Azure.PowerShell.Compute" Version="1.0.0" />
13+
<PackageReference Include="Microsoft.Azure.PowerShell.Graph.Rbac" Version="1.0.0" />
14+
<PackageReference Include="Microsoft.Azure.PowerShell.KeyVault" Version="1.0.0" />
15+
<PackageReference Include="Microsoft.Azure.PowerShell.Network" Version="1.0.0" />
16+
<PackageReference Include="Microsoft.Azure.PowerShell.ResourceManager" Version="1.0.0" />
17+
<PackageReference Include="Microsoft.Azure.PowerShell.Storage" Version="1.0.0-preview" />
18+
<PackageReference Include="Microsoft.Azure.PowerShell.Storage.Management" Version="1.0.0-preview" />
19+
<PackageReference Include="Microsoft.Azure.PowerShell.Strategies" Version="1.0.0-preview" />
20+
<PackageReference Include="Microsoft.Azure.PowerShell.Websites" Version="1.0.0" />
21+
</ItemGroup>
22+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
23+
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.4.0" />
24+
<PackageReference Include="Microsoft.Azure.Common" Version="2.2.0" />
25+
<PackageReference Include="Hyak.Common" Version="1.2.0" />
26+
<PackageReference Include="PowerShellStandard.Library" Version="5.1.0-preview-06" PrivateAssets="All" />
27+
</ItemGroup>
28+
<PropertyGroup>
29+
<!-- <StorageToolsPath>$(MSBuildThisFileDirectory)..\src\packages\Microsoft.Azure.PowerShell.Storage.1.0.0-preview\tools\</StorageToolsPath> -->
30+
<StorageToolsPath>$(MSBuildThisFileDirectory)..\src\Common\Commands.Common.Storage\</StorageToolsPath>
31+
</PropertyGroup>
32+
<ItemGroup Condition='$(OmitJsonPackage)' != 'true'"">
533
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
634
</ItemGroup>
735
</Project>

0 commit comments

Comments
 (0)