Skip to content

Commit c665357

Browse files
authored
Merge pull request #7157 from MiYanni/myget-common-packages
Using MyGet common packages
2 parents b6a1b29 + 53f5d7a commit c665357

File tree

38 files changed

+92
-112
lines changed

38 files changed

+92
-112
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ before_install:
2525
# https://github.com/travis-ci/travis-ci/issues/1066#issuecomment-383489298
2626
script:
2727
- sudo dotnet msbuild build.proj /t:BuildNetcore /p:Configuration=$CONFIG || travis_terminate 1
28-
- sudo dotnet tools/StaticAnalysis/bin/$CONFIG/netcoreapp2.1/StaticAnalysis.Netcore.dll -p src/Package/$CONFIG -r src/Package -u
28+
- sudo dotnet tools/StaticAnalysis/bin/$CONFIG/netcoreapp2.1/StaticAnalysis.Netcore.dll -p src/Package/$CONFIG -r src/Package -u || travis_terminate 1
2929
- sudo pwsh -NonInteractive -NoLogo -NoProfile -File tools/TestModuleLoading.ps1 || travis_terminate 1
3030
- sudo dotnet test src/Azure.PowerShell.Netcore.Test.sln --filter "AcceptanceType=CheckIn&RunType!=DesktopOnly" --configuration $CONFIG
3131

NuGet.Config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
66
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
77
<add key="powershell-core" value="https://powershell.myget.org/F/powershell-core/api/v3/index.json" />
8+
<add key="myget-azure-powershell" value="https://www.myget.org/F/azure-powershell/api/v3/index.json" />
89
</packageSources>
910
</configuration>

build.proj

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
<PropertyGroup>
173173
<NuGetCommand>$(MSBuildProjectDirectory)\tools\NuGet.exe</NuGetCommand>
174174
<LibraryNugetPackageFolder>$(LibrarySourceFolder)\packages</LibraryNugetPackageFolder>
175-
<NuGetRestoreConfigFile>$(MSBuildProjectDirectory)\restore.config</NuGetRestoreConfigFile>
175+
<NuGetRestoreConfigFile>$(MSBuildProjectDirectory)\NuGet.Config</NuGetRestoreConfigFile>
176176
<NuGetRestoreConfigSwitch>-ConfigFile &quot;$(NuGetRestoreConfigFile)&quot;</NuGetRestoreConfigSwitch>
177177
<NuGetRestorePackageSetting>-PackagesDirectory $(LibraryNugetPackageFolder)</NuGetRestorePackageSetting>
178178
<NuGetLocalBuildTaskPackages>-PackagesDirectory $(LibraryToolsFolder)\BuildPackagesTask\packages</NuGetLocalBuildTaskPackages>
@@ -191,16 +191,6 @@
191191
-->
192192
<Target Name="RestoreNugetPackages" Condition="$(SkipNugetRestore) == 'false'">
193193
<Message Importance="high" Text="Restore Nuget packages..." />
194-
195-
<Delete Files="$(NuGetRestoreConfigFile)" />
196-
<WriteLinesToFile
197-
File="$(NuGetRestoreConfigFile)"
198-
Lines="&lt;configuration&gt;&lt;/configuration&gt;"
199-
Overwrite="true"
200-
Encoding="Unicode"/>
201-
202-
<Exec Command="$(NuGetCommand) sources add -Name LocalFeed -Source &quot;$(LocalFeedFolder)&quot; $(NuGetRestoreConfigSwitch)"/>
203-
<Exec Command="$(NuGetCommand) sources add -Name nugetRemote -Source &quot;https://api.nuget.org/v3/index.json&quot; $(NuGetRestoreConfigSwitch)"/>
204194
<!-- Restore packages -->
205195
<Exec Command="$(NuGetCommand) restore %(StackSolution.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
206196
Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'"
@@ -218,8 +208,6 @@
218208
ContinueOnError="false" />
219209
<!--Restore the xunit runner needed to run unit tests-->
220210
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\packages.config -PackagesDirectory $(MSBuildProjectDirectory)\packages" />
221-
222-
<Delete Files="$(NuGetRestoreConfigFile)" />
223211
</Target>
224212

225213
<Target Name="FilterBuild">
@@ -259,16 +247,7 @@
259247
<Message Text=""/>
260248

261249
<!-- Restore packages -->
262-
<Delete Files="$(NuGetRestoreConfigFile)" />
263-
<WriteLinesToFile
264-
File="$(NuGetRestoreConfigFile)"
265-
Lines="&lt;configuration&gt;&lt;/configuration&gt;"
266-
Overwrite="true"
267-
Encoding="Unicode"/>
268-
<Exec Command="$(NuGetCommand) sources add -Name LocalFeed -Source &quot;$(MSBuildProjectDirectory)\tools\LocalFeed&quot; $(NuGetRestoreConfigSwitch)"/>
269-
<Exec Command="$(NuGetCommand) sources add -Name nugetRemote -Source &quot;https://api.nuget.org/v3/index.json&quot; $(NuGetRestoreConfigSwitch)"/>
270250
<Exec Command="$(NuGetCommand) restore %(CmdletSolutionsToBuild.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)" ContinueOnError="false" />
271-
<Delete Files="$(NuGetRestoreConfigFile)" />
272251
</Target>
273252

274253
<!-- Build all flavors of the Cmdlets -->

src/ResourceManager/Profile/Commands.Profile/packages.config

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@
1010
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.ResourceManager" version="1.9.0-preview" targetFramework="net452" />
1212
<package id="Microsoft.Azure.Management.Resources" version="2.20.1-preview" targetFramework="net452" />
13-
<package id="Microsoft.Azure.PowerShell.Aks" version="1.0.96-preview" targetFramework="net452" />
14-
<package id="Microsoft.Azure.PowerShell.Authentication" version="1.0.96-preview" targetFramework="net452" />
15-
<package id="Microsoft.Azure.PowerShell.Authentication.Abstractions" version="1.0.96-preview" targetFramework="net452" />
16-
<package id="Microsoft.Azure.PowerShell.Authentication.ResourceManager" version="1.0.96-preview" targetFramework="net452" />
17-
<package id="Microsoft.Azure.PowerShell.Authorization" version="1.0.96-preview" targetFramework="net452" />
18-
<package id="Microsoft.Azure.PowerShell.Common" version="1.0.96-preview" targetFramework="net452" />
19-
<package id="Microsoft.Azure.PowerShell.Compute" version="1.0.96-preview" targetFramework="net452" />
20-
<package id="Microsoft.Azure.PowerShell.Graph.Rbac" version="1.0.96-preview" targetFramework="net452" />
21-
<package id="Microsoft.Azure.PowerShell.KeyVault" version="1.0.96-preview" targetFramework="net452" />
22-
<package id="Microsoft.Azure.PowerShell.Network" version="1.0.96-preview" targetFramework="net452" />
23-
<package id="Microsoft.Azure.PowerShell.ResourceManager" version="1.0.96-preview" targetFramework="net452" />
24-
<package id="Microsoft.Azure.PowerShell.ScenarioTest.ResourceManager" version="1.0.96-preview" targetFramework="net452" />
25-
<package id="Microsoft.Azure.PowerShell.ServiceManagement" version="1.0.96-preview" targetFramework="net452" />
26-
<package id="Microsoft.Azure.PowerShell.Storage" version="1.0.96-preview" targetFramework="net452" />
27-
<package id="Microsoft.Azure.PowerShell.Storage.Management" version="1.0.96-preview" targetFramework="net452" />
28-
<package id="Microsoft.Azure.PowerShell.Strategies" version="1.0.96-preview" targetFramework="net452" />
29-
<package id="Microsoft.Azure.PowerShell.Websites" version="1.0.96-preview" targetFramework="net452" />
13+
<package id="Microsoft.Azure.PowerShell.Aks" version="1.1.0-preview" targetFramework="net452" />
14+
<package id="Microsoft.Azure.PowerShell.Authentication" version="1.1.0-preview" targetFramework="net452" />
15+
<package id="Microsoft.Azure.PowerShell.Authentication.Abstractions" version="1.1.0-preview" targetFramework="net452" />
16+
<package id="Microsoft.Azure.PowerShell.Authentication.ResourceManager" version="1.1.0-preview" targetFramework="net452" />
17+
<package id="Microsoft.Azure.PowerShell.Authorization" version="1.1.0-preview" targetFramework="net452" />
18+
<package id="Microsoft.Azure.PowerShell.Common" version="1.1.0-preview" targetFramework="net452" />
19+
<package id="Microsoft.Azure.PowerShell.Compute" version="1.1.0-preview" targetFramework="net452" />
20+
<package id="Microsoft.Azure.PowerShell.Graph.Rbac" version="1.1.0-preview" targetFramework="net452" />
21+
<package id="Microsoft.Azure.PowerShell.KeyVault" version="1.1.0-preview" targetFramework="net452" />
22+
<package id="Microsoft.Azure.PowerShell.Network" version="1.1.0-preview" targetFramework="net452" />
23+
<package id="Microsoft.Azure.PowerShell.ResourceManager" version="1.1.0-preview" targetFramework="net452" />
24+
<package id="Microsoft.Azure.PowerShell.ScenarioTest.ResourceManager" version="1.1.0-preview" targetFramework="net452" />
25+
<package id="Microsoft.Azure.PowerShell.ServiceManagement" version="1.1.0-preview" targetFramework="net452" />
26+
<package id="Microsoft.Azure.PowerShell.Storage" version="1.1.0-preview" targetFramework="net452" />
27+
<package id="Microsoft.Azure.PowerShell.Storage.Management" version="1.1.0-preview" targetFramework="net452" />
28+
<package id="Microsoft.Azure.PowerShell.Strategies" version="1.1.0-preview" targetFramework="net452" />
29+
<package id="Microsoft.Azure.PowerShell.Websites" version="1.1.0-preview" targetFramework="net452" />
3030
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net452" />
3131
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.8.1" targetFramework="net452" />
3232
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net452" />

src/ServiceManagement/Services/Commands.Utilities/packages.config

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
99
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Resources" version="2.20.1-preview" targetFramework="net452" />
11-
<package id="Microsoft.Azure.PowerShell.Authentication" version="1.0.96-preview" targetFramework="net452" />
12-
<package id="Microsoft.Azure.PowerShell.Authentication.Abstractions" version="1.0.96-preview" targetFramework="net452" />
13-
<package id="Microsoft.Azure.PowerShell.Authorization" version="1.0.96-preview" targetFramework="net452" />
14-
<package id="Microsoft.Azure.PowerShell.Common" version="1.0.96-preview" targetFramework="net452" />
15-
<package id="Microsoft.Azure.PowerShell.ScenarioTest" version="1.0.96-preview" targetFramework="net452" />
16-
<package id="Microsoft.Azure.PowerShell.ServiceManagement" version="1.0.96-preview" targetFramework="net452" />
17-
<package id="Microsoft.Azure.PowerShell.Storage" version="1.0.96-preview" targetFramework="net452" />
18-
<package id="Microsoft.Azure.PowerShell.Storage.Management" version="1.0.96-preview" targetFramework="net452" />
11+
<package id="Microsoft.Azure.PowerShell.Authentication" version="1.1.0-preview" targetFramework="net452" />
12+
<package id="Microsoft.Azure.PowerShell.Authentication.Abstractions" version="1.1.0-preview" targetFramework="net452" />
13+
<package id="Microsoft.Azure.PowerShell.Authorization" version="1.1.0-preview" targetFramework="net452" />
14+
<package id="Microsoft.Azure.PowerShell.Common" version="1.1.0-preview" targetFramework="net452" />
15+
<package id="Microsoft.Azure.PowerShell.ScenarioTest" version="1.1.0-preview" targetFramework="net452" />
16+
<package id="Microsoft.Azure.PowerShell.ServiceManagement" version="1.1.0-preview" targetFramework="net452" />
17+
<package id="Microsoft.Azure.PowerShell.Storage" version="1.1.0-preview" targetFramework="net452" />
18+
<package id="Microsoft.Azure.PowerShell.Storage.Management" version="1.1.0-preview" targetFramework="net452" />
1919
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net452" />
2020
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.8.1" targetFramework="net452" />
2121
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />

src/Storage/Commands.Storage/Commands.Storage.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<HintPath>..\..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
6060
</Reference>
6161
<Reference Include="Microsoft.Azure.Commands.ResourceManager.Common, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
62-
<HintPath>..\..\packages\Microsoft.Azure.PowerShell.ResourceManager.1.0.96-preview\lib\net452\Microsoft.Azure.Commands.ResourceManager.Common.dll</HintPath>
62+
<HintPath>..\..\packages\Microsoft.Azure.PowerShell.ResourceManager.1.1.0-preview\lib\net452\Microsoft.Azure.Commands.ResourceManager.Common.dll</HintPath>
6363
<Private>True</Private>
6464
</Reference>
6565
</ItemGroup>

src/Storage/Commands.Storage/packages.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net452" />
77
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net452" />
88
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
9-
<package id="Microsoft.Azure.PowerShell.Authentication.Abstractions" version="1.0.96-preview" targetFramework="net452" />
10-
<package id="Microsoft.Azure.PowerShell.Common" version="1.0.96-preview" targetFramework="net452" />
11-
<package id="Microsoft.Azure.PowerShell.ResourceManager" version="1.0.96-preview" targetFramework="net452" />
12-
<package id="Microsoft.Azure.PowerShell.Storage" version="1.0.96-preview" targetFramework="net452" />
9+
<package id="Microsoft.Azure.PowerShell.Authentication.Abstractions" version="1.1.0-preview" targetFramework="net452" />
10+
<package id="Microsoft.Azure.PowerShell.Common" version="1.1.0-preview" targetFramework="net452" />
11+
<package id="Microsoft.Azure.PowerShell.ResourceManager" version="1.1.0-preview" targetFramework="net452" />
12+
<package id="Microsoft.Azure.PowerShell.Storage" version="1.1.0-preview" targetFramework="net452" />
1313
<package id="Microsoft.Azure.Storage.DataMovement" version="0.8.1" targetFramework="net452" />
1414
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net452" />
1515
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />

tools/AzureRM/AzureRM.psm1

8.85 KB
Binary file not shown.

tools/Common.Dependencies.Test.targets

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
<Private>True</Private>
2222
</Reference>
2323
<Reference Include="Microsoft.Azure.Commands.ScenarioTest.Common, Version=1.0.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
24-
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.ScenarioTest.ResourceManager.1.0.96-preview\lib\net452\Microsoft.Azure.Commands.ScenarioTest.Common.dll</HintPath>
24+
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.ScenarioTest.ResourceManager.1.1.0-preview\lib\net452\Microsoft.Azure.Commands.ScenarioTest.Common.dll</HintPath>
2525
<Private>True</Private>
2626
</Reference>
2727
<Reference Include="Microsoft.WindowsAzure.Commands.ServiceManagement.Common, Version=5.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
28-
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.ServiceManagement.1.0.96-preview\lib\net452\Microsoft.WindowsAzure.Commands.ServiceManagement.Common.dll</HintPath>
28+
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.ServiceManagement.1.1.0-preview\lib\net452\Microsoft.WindowsAzure.Commands.ServiceManagement.Common.dll</HintPath>
2929
<Private>True</Private>
3030
</Reference>
3131
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -66,7 +66,7 @@
6666
</Reference>
6767
</ItemGroup>
6868
<PropertyGroup>
69-
<ScenarioTestToolsPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.ScenarioTest.ResourceManager.1.0.96-preview\tools\</ScenarioTestToolsPath>
69+
<ScenarioTestToolsPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.ScenarioTest.ResourceManager.1.1.0-preview\tools\</ScenarioTestToolsPath>
7070
</PropertyGroup>
7171
<ItemGroup>
7272
<None Include="$(ScenarioTestToolsPath)Assert.ps1">

0 commit comments

Comments
 (0)