Skip to content

Commit cf15c67

Browse files
ogailogail
ogail
authored and
ogail
committed
Align imported NuGet packages for Azure PowerShell solution
1 parent 7fe760c commit cf15c67

File tree

21 files changed

+51
-87
lines changed

21 files changed

+51
-87
lines changed

‎src/ResourceManager/Batch/Commands.Batch.Test/Commands.Batch.Test.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
</Reference>
5656
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5757
<SpecificVersion>False</SpecificVersion>
58-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.6.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
58+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.7.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
5959
</Reference>
6060
<Reference Include="Microsoft.Azure.Utilities.HttpRecorder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6161
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/Batch/Commands.Batch.Test/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<package id="Microsoft.Azure.Gallery" version="2.2.0-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Management.Authorization" version="0.11.0-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.Batch" version="1.1.6-preview" targetFramework="net45" />
8-
<package id="Microsoft.Azure.Management.Resources" version="2.6.0-preview" targetFramework="net45" />
8+
<package id="Microsoft.Azure.Management.Resources" version="2.7.0-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Monitoring" version="2.2.0-preview" targetFramework="net45" />
1010
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1111
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

‎src/ResourceManager/Batch/Commands.Batch/Commands.Batch.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
</Reference>
4848
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4949
<SpecificVersion>False</SpecificVersion>
50-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.6.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
50+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.7.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
5151
</Reference>
5252
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
5353
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/Batch/Commands.Batch/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Microsoft.Azure.Management.Batch" version="1.1.6-preview" targetFramework="net45" />
4-
<package id="Microsoft.Azure.Management.Resources" version="2.6.0-preview" targetFramework="net45" />
4+
<package id="Microsoft.Azure.Management.Resources" version="2.7.0-preview" targetFramework="net45" />
55
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
66
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
77
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />

‎src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,19 @@
4444
<ItemGroup>
4545
<Reference Include="Microsoft.Azure.Gallery, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4646
<SpecificVersion>False</SpecificVersion>
47-
<HintPath>..\..\..\packages\Microsoft.Azure.Gallery.2.2.1-preview\lib\net40\Microsoft.Azure.Gallery.dll</HintPath>
47+
<HintPath>..\..\..\packages\Microsoft.Azure.Gallery.2.2.0-preview\lib\net40\Microsoft.Azure.Gallery.dll</HintPath>
4848
</Reference>
4949
<Reference Include="Microsoft.Azure.Management.Sql, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5050
<SpecificVersion>False</SpecificVersion>
5151
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.14.3-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
5252
</Reference>
5353
<Reference Include="Microsoft.Azure.Monitoring, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5454
<SpecificVersion>False</SpecificVersion>
55-
<HintPath>..\..\..\packages\Microsoft.Azure.Monitoring.2.2.1-preview\lib\net40\Microsoft.Azure.Monitoring.dll</HintPath>
55+
<HintPath>..\..\..\packages\Microsoft.Azure.Monitoring.2.2.0-preview\lib\net40\Microsoft.Azure.Monitoring.dll</HintPath>
5656
</Reference>
5757
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5858
<SpecificVersion>False</SpecificVersion>
59-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.7.1-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
59+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.7.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
6060
</Reference>
6161
<Reference Include="Microsoft.Azure.Utilities.HttpRecorder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6262
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/Sql/Commands.Sql.Test/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<packages>
33
<package id="Hydra.HttpRecorder" version="1.0.5417.13285-prerelease" targetFramework="net45" />
44
<package id="Hydra.SpecTestSupport" version="1.0.5417.13285-prerelease" targetFramework="net45" />
5-
<package id="Microsoft.Azure.Gallery" version="2.2.1-preview" targetFramework="net45" />
6-
<package id="Microsoft.Azure.Management.Resources" version="2.7.1-preview" targetFramework="net45" />
5+
<package id="Microsoft.Azure.Gallery" version="2.2.0-preview" targetFramework="net45" />
6+
<package id="Microsoft.Azure.Management.Resources" version="2.7.0-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.Sql" version="0.14.3-prerelease" targetFramework="net45" />
8-
<package id="Microsoft.Azure.Monitoring" version="2.2.1-preview" targetFramework="net45" />
8+
<package id="Microsoft.Azure.Monitoring" version="2.2.0-preview" targetFramework="net45" />
99
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1010
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1111
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />

‎src/ResourceManager/Sql/Commands.Sql/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616
<package id="Microsoft.WindowsAzure.Management.Storage" version="3.1.0" targetFramework="net45" />
1717
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
1818
<package id="System.Spatial" version="5.6.0" targetFramework="net45" />
19-
<package id="WindowsAzure.Storage" version="4.2.1" targetFramework="net45" />
19+
<package id="WindowsAzure.Storage" version="4.0.0" targetFramework="net45" />
2020
</packages>

‎src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/Commands.StreamAnalytics.Test.csproj‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<FileAlignment>512</FileAlignment>
1515
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
1616
<RestorePackages>true</RestorePackages>
17-
<NuGetPackageImportStamp>7f789c0b</NuGetPackageImportStamp>
1817
</PropertyGroup>
1918
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2019
<DebugSymbols>true</DebugSymbols>
@@ -26,7 +25,7 @@
2625
<WarningLevel>4</WarningLevel>
2726
</PropertyGroup>
2827
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29-
<SignAssembly>true</SignAssembly>
28+
<SignAssembly>true</SignAssembly>
3029
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
3130
<DelaySign>true</DelaySign>
3231
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
@@ -202,7 +201,12 @@
202201
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
203202
</PropertyGroup>
204203
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
205-
</Target>
204+
</Target>
205+
<Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
206+
<Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
207+
<Error Condition="!Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
208+
<Error Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
209+
</Target>
206210
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
207211
Other similar extension points exist, see Microsoft.Common.targets.
208212
<Target Name="BeforeBuild">

‎src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<package id="Hydra.SpecTestSupport" version="1.0.5417.13285-prerelease" targetFramework="net45" />
55
<package id="Microsoft.Azure.Gallery" version="2.2.0-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Management.Authorization" version="0.11.0-preview" targetFramework="net45" />
7-
<package id="Microsoft.Azure.Management.StreamAnalytics" version="0.12.1-preview" targetFramework="net45" />
87
<package id="Microsoft.Azure.Management.Resources" version="2.7.0-preview" targetFramework="net45" />
8+
<package id="Microsoft.Azure.Management.StreamAnalytics" version="0.12.1-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Monitoring" version="2.2.0-preview" targetFramework="net45" />
1010
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1111
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
12-
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net45" />
12+
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
1313
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.11.10918.1222" targetFramework="net45" />
1414
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1515
<package id="Microsoft.WindowsAzure.Common" version="1.4.1" targetFramework="net45" />

‎src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,14 @@
5252
<SpecificVersion>False</SpecificVersion>
5353
<HintPath>..\..\..\packages\Microsoft.Azure.Management.StreamAnalytics.0.12.1-preview\lib\net40\Microsoft.Azure.Management.StreamAnalytics.dll</HintPath>
5454
</Reference>
55+
<Reference Include="Microsoft.WindowsAzure.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
56+
<SpecificVersion>False</SpecificVersion>
57+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Common.1.4.1\lib\net45\Microsoft.WindowsAzure.Common.dll</HintPath>
58+
</Reference>
59+
<Reference Include="Microsoft.WindowsAzure.Common.NetFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60+
<SpecificVersion>False</SpecificVersion>
61+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Common.1.4.1\lib\net45\Microsoft.WindowsAzure.Common.NetFramework.dll</HintPath>
62+
</Reference>
5563
<Reference Include="System" />
5664
<Reference Include="System.Core" />
5765
<Reference Include="System.Net" />
@@ -71,14 +79,6 @@
7179
<Reference Include="System.Data" />
7280
<Reference Include="System.Xml" />
7381
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
74-
<Reference Include="Microsoft.WindowsAzure.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75-
<SpecificVersion>False</SpecificVersion>
76-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Common.1.4.0\lib\net45\Microsoft.WindowsAzure.Common.dll</HintPath>
77-
</Reference>
78-
<Reference Include="Microsoft.WindowsAzure.Common.NetFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
79-
<SpecificVersion>False</SpecificVersion>
80-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Common.1.4.0\lib\net45\Microsoft.WindowsAzure.Common.NetFramework.dll</HintPath>
81-
</Reference>
8282
<Reference Include="Microsoft.WindowsAzure.Storage, Version=3.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8383
<SpecificVersion>False</SpecificVersion>
8484
<HintPath>..\..\..\packages\WindowsAzure.Storage.4.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>

0 commit comments

Comments
 (0)