Skip to content

Commit 6e1a2ee

Browse files
author
Avijit Gupta
committed
Fixes from merge:
1 parent 94e5df8 commit 6e1a2ee

File tree

9 files changed

+7
-15
lines changed

9 files changed

+7
-15
lines changed

‎src/Common/Commands.Common.Test/Commands.Common.Test.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,7 @@
106106
<Reference Include="Microsoft.WindowsAzure.Management">
107107
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
108108
</Reference>
109-
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=12.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
110-
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Compute.11.2.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
109+
<Reference Include="Microsoft.WindowsAzure.Management.Compute">
111110
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.1.0-preview\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
112111
</Reference>
113112
<Reference Include="Microsoft.WindowsAzure.Management.Storage">

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@
169169
<Compile Include="ScenarioTests\EndToEndTests.cs" />
170170
</ItemGroup>
171171
<ItemGroup>
172-
<None Include="app.config" />
173172
<None Include="MSSharedLibKey.snk" />
174173
<None Include="packages.config">
175174
<SubType>Designer</SubType>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@
117117
<Compile Include="Properties\AssemblyInfo.cs" />
118118
</ItemGroup>
119119
<ItemGroup>
120-
<None Include="app.config" />
121120
<None Include="MSSharedLibKey.snk" />
122121
<None Include="packages.config">
123122
<SubType>Designer</SubType>

‎src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/Commands.ServiceManagement.PlatformImageRepository.csproj

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,10 @@
111111
<Reference Include="Microsoft.WindowsAzure.Management">
112112
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
113113
</Reference>
114-
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=12.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
114+
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=12.0.0.0, Culture=neutral, processorArchitecture=MSIL">
115115
<SpecificVersion>False</SpecificVersion>
116116
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.1.0-preview\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
117117
</Reference>
118-
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=11.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
119-
<SpecificVersion>False</SpecificVersion>
120-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.11.2.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
121-
</Reference>
122118
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
123119
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
124120
</Reference>

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Commands.ServiceManagement.Preview.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@
111111
<Reference Include="Microsoft.WindowsAzure.Management">
112112
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
113113
</Reference>
114-
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=12.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
114+
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=12.0.0.0, Culture=neutral, processorArchitecture=MSIL">
115+
<SpecificVersion>False</SpecificVersion>
115116
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.1.0-preview\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
116117
</Reference>
117118
<Reference Include="Microsoft.WindowsAzure.Management.Network, Version=7.0.0.0, Culture=neutral, processorArchitecture=MSIL">

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<Reference Include="Microsoft.WindowsAzure.Management">
107107
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
108108
</Reference>
109-
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=12.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
109+
<Reference Include="Microsoft.WindowsAzure.Management.Compute">
110110
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.1.0-preview\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
111111
</Reference>
112112
<Reference Include="Microsoft.WindowsAzure.Management.Network">

‎src/ServiceManagement/Compute/Commands.ServiceManagement/Commands.ServiceManagement.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
<Reference Include="Microsoft.WindowsAzure.Management">
114114
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
115115
</Reference>
116-
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=12.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
116+
<Reference Include="Microsoft.WindowsAzure.Management.Compute">
117117
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.1.0-preview\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
118118
</Reference>
119119
<Reference Include="Microsoft.WindowsAzure.Management.Network, Version=7.0.0.0, Culture=neutral, processorArchitecture=MSIL">

‎src/ServiceManagement/RemoteApp/Commands.RemoteApp.Test/Commands.RemoteApp.Test.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
<WarningLevel>4</WarningLevel>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<None Include="app.config" />
4039
<None Include="packages.config" />
4140
</ItemGroup>
4241
<ItemGroup>

‎src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,8 @@
117117
<Reference Include="Microsoft.WindowsAzure.Management">
118118
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
119119
</Reference>
120-
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=12.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
120+
<Reference Include="Microsoft.WindowsAzure.Management.Compute">
121121
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.1.0-preview\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
122-
<Private>True</Private>
123122
</Reference>
124123
<Reference Include="Microsoft.WindowsAzure.Management.MediaServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
125124
<SpecificVersion>False</SpecificVersion>

0 commit comments

Comments
 (0)