Replaced 1.0.96 local packages with myget 1.1.0 packages. Fixed missing failure termination in travis yml. Removed legacy restore.config logic from build.proj and use the root NuGet.Config instead.

Author: MiYanni

.travis.yml

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

NuGet.Config

@@ -5,5 +5,6 @@
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
     <add key="powershell-core" value="https://powershell.myget.org/F/powershell-core/api/v3/index.json" />
+    <add key="myget-azure-powershell" value="https://www.myget.org/F/azure-powershell/api/v3/index.json" />
   </packageSources>
 </configuration>

build.proj

@@ -172,7 +172,7 @@
   <PropertyGroup>
     <NuGetCommand>$(MSBuildProjectDirectory)\tools\NuGet.exe</NuGetCommand>
     <LibraryNugetPackageFolder>$(LibrarySourceFolder)\packages</LibraryNugetPackageFolder>
-    <NuGetRestoreConfigFile>$(MSBuildProjectDirectory)\restore.config</NuGetRestoreConfigFile>
+    <NuGetRestoreConfigFile>$(MSBuildProjectDirectory)\NuGet.Config</NuGetRestoreConfigFile>
     <NuGetRestoreConfigSwitch>-ConfigFile &quot;$(NuGetRestoreConfigFile)&quot;</NuGetRestoreConfigSwitch>
     <NuGetRestorePackageSetting>-PackagesDirectory $(LibraryNugetPackageFolder)</NuGetRestorePackageSetting>
     <NuGetLocalBuildTaskPackages>-PackagesDirectory $(LibraryToolsFolder)\BuildPackagesTask\packages</NuGetLocalBuildTaskPackages>
@@ -191,16 +191,6 @@
   -->
   <Target Name="RestoreNugetPackages" Condition="$(SkipNugetRestore) == 'false'">
     <Message Importance="high" Text="Restore Nuget packages..." />
-
-    <Delete Files="$(NuGetRestoreConfigFile)" />
-    <WriteLinesToFile
-      File="$(NuGetRestoreConfigFile)"
-      Lines="&lt;configuration&gt;&lt;/configuration&gt;"
-      Overwrite="true"
-      Encoding="Unicode"/>
-
-    <Exec Command="$(NuGetCommand) sources add -Name LocalFeed -Source &quot;$(LocalFeedFolder)&quot; $(NuGetRestoreConfigSwitch)"/>
-    <Exec Command="$(NuGetCommand) sources add -Name nugetRemote -Source &quot;https://api.nuget.org/v3/index.json&quot; $(NuGetRestoreConfigSwitch)"/>
     <!-- Restore packages -->
     <Exec Command="$(NuGetCommand) restore %(StackSolution.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
           Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'"
@@ -218,8 +208,6 @@
             ContinueOnError="false" />
     <!--Restore the xunit runner needed to run unit tests-->
     <Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\packages.config -PackagesDirectory $(MSBuildProjectDirectory)\packages" />
-
-    <Delete Files="$(NuGetRestoreConfigFile)" />
   </Target>
 
   <Target Name="FilterBuild">
@@ -259,16 +247,7 @@
     <Message Text=""/>
 
     <!-- Restore packages -->
-    <Delete Files="$(NuGetRestoreConfigFile)" />
-    <WriteLinesToFile
-      File="$(NuGetRestoreConfigFile)"
-      Lines="&lt;configuration&gt;&lt;/configuration&gt;"
-      Overwrite="true"
-      Encoding="Unicode"/>
-    <Exec Command="$(NuGetCommand) sources add -Name LocalFeed -Source &quot;$(MSBuildProjectDirectory)\tools\LocalFeed&quot; $(NuGetRestoreConfigSwitch)"/>
-    <Exec Command="$(NuGetCommand) sources add -Name nugetRemote -Source &quot;https://api.nuget.org/v3/index.json&quot; $(NuGetRestoreConfigSwitch)"/>
     <Exec Command="$(NuGetCommand) restore %(CmdletSolutionsToBuild.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)" ContinueOnError="false" />
-    <Delete Files="$(NuGetRestoreConfigFile)" />
   </Target>
 
   <!-- Build all flavors of the Cmdlets -->

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

@@ -10,23 +10,23 @@
   <package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.ResourceManager" version="1.9.0-preview" targetFramework="net452" />
   <package id="Microsoft.Azure.Management.Resources" version="2.20.1-preview" targetFramework="net452" />
-  <package id="Microsoft.Azure.PowerShell.Aks" version="1.0.96-preview" targetFramework="net452" />
-  <package id="Microsoft.Azure.PowerShell.Authentication" version="1.0.96-preview" targetFramework="net452" />
-  <package id="Microsoft.Azure.PowerShell.Authentication.Abstractions" version="1.0.96-preview" targetFramework="net452" />
-  <package id="Microsoft.Azure.PowerShell.Authentication.ResourceManager" version="1.0.96-preview" targetFramework="net452" />
-  <package id="Microsoft.Azure.PowerShell.Authorization" version="1.0.96-preview" targetFramework="net452" />
-  <package id="Microsoft.Azure.PowerShell.Common" version="1.0.96-preview" targetFramework="net452" />
-  <package id="Microsoft.Azure.PowerShell.Compute" version="1.0.96-preview" targetFramework="net452" />
-  <package id="Microsoft.Azure.PowerShell.Graph.Rbac" version="1.0.96-preview" targetFramework="net452" />
-  <package id="Microsoft.Azure.PowerShell.KeyVault" version="1.0.96-preview" targetFramework="net452" />
-  <package id="Microsoft.Azure.PowerShell.Network" version="1.0.96-preview" targetFramework="net452" />
-  <package id="Microsoft.Azure.PowerShell.ResourceManager" version="1.0.96-preview" targetFramework="net452" />
-  <package id="Microsoft.Azure.PowerShell.ScenarioTest.ResourceManager" version="1.0.96-preview" targetFramework="net452" />
-  <package id="Microsoft.Azure.PowerShell.ServiceManagement" version="1.0.96-preview" targetFramework="net452" />
-  <package id="Microsoft.Azure.PowerShell.Storage" version="1.0.96-preview" targetFramework="net452" />
-  <package id="Microsoft.Azure.PowerShell.Storage.Management" version="1.0.96-preview" targetFramework="net452" />
-  <package id="Microsoft.Azure.PowerShell.Strategies" version="1.0.96-preview" targetFramework="net452" />
-  <package id="Microsoft.Azure.PowerShell.Websites" version="1.0.96-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.PowerShell.Aks" version="1.1.0-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.PowerShell.Authentication" version="1.1.0-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.PowerShell.Authentication.Abstractions" version="1.1.0-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.PowerShell.Authentication.ResourceManager" version="1.1.0-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.PowerShell.Authorization" version="1.1.0-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.PowerShell.Common" version="1.1.0-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.PowerShell.Compute" version="1.1.0-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.PowerShell.Graph.Rbac" version="1.1.0-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.PowerShell.KeyVault" version="1.1.0-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.PowerShell.Network" version="1.1.0-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.PowerShell.ResourceManager" version="1.1.0-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.PowerShell.ScenarioTest.ResourceManager" version="1.1.0-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.PowerShell.ServiceManagement" version="1.1.0-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.PowerShell.Storage" version="1.1.0-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.PowerShell.Storage.Management" version="1.1.0-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.PowerShell.Strategies" version="1.1.0-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.PowerShell.Websites" version="1.1.0-preview" targetFramework="net452" />
   <package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net452" />
   <package id="Microsoft.Azure.Test.HttpRecorder" version="1.8.1" targetFramework="net452" />
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net452" />

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

@@ -8,14 +8,14 @@
   <package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Resources" version="2.20.1-preview" targetFramework="net452" />
-  <package id="Microsoft.Azure.PowerShell.Authentication" version="1.0.96-preview" targetFramework="net452" />
-  <package id="Microsoft.Azure.PowerShell.Authentication.Abstractions" version="1.0.96-preview" targetFramework="net452" />
-  <package id="Microsoft.Azure.PowerShell.Authorization" version="1.0.96-preview" targetFramework="net452" />
-  <package id="Microsoft.Azure.PowerShell.Common" version="1.0.96-preview" targetFramework="net452" />
-  <package id="Microsoft.Azure.PowerShell.ScenarioTest" version="1.0.96-preview" targetFramework="net452" />
-  <package id="Microsoft.Azure.PowerShell.ServiceManagement" version="1.0.96-preview" targetFramework="net452" />
-  <package id="Microsoft.Azure.PowerShell.Storage" version="1.0.96-preview" targetFramework="net452" />
-  <package id="Microsoft.Azure.PowerShell.Storage.Management" version="1.0.96-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.PowerShell.Authentication" version="1.1.0-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.PowerShell.Authentication.Abstractions" version="1.1.0-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.PowerShell.Authorization" version="1.1.0-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.PowerShell.Common" version="1.1.0-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.PowerShell.ScenarioTest" version="1.1.0-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.PowerShell.ServiceManagement" version="1.1.0-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.PowerShell.Storage" version="1.1.0-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.PowerShell.Storage.Management" version="1.1.0-preview" targetFramework="net452" />
   <package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net452" />
   <package id="Microsoft.Azure.Test.HttpRecorder" version="1.8.1" targetFramework="net452" />
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />

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

@@ -59,7 +59,7 @@
       <HintPath>..\..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.Commands.ResourceManager.Common, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Azure.PowerShell.ResourceManager.1.0.96-preview\lib\net452\Microsoft.Azure.Commands.ResourceManager.Common.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Azure.PowerShell.ResourceManager.1.1.0-preview\lib\net452\Microsoft.Azure.Commands.ResourceManager.Common.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>

src/Storage/Commands.Storage/packages.config

@@ -6,10 +6,10 @@
   <package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net452" />
   <package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net452" />
   <package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
-  <package id="Microsoft.Azure.PowerShell.Authentication.Abstractions" version="1.0.96-preview" targetFramework="net452" />
-  <package id="Microsoft.Azure.PowerShell.Common" version="1.0.96-preview" targetFramework="net452" />
-  <package id="Microsoft.Azure.PowerShell.ResourceManager" version="1.0.96-preview" targetFramework="net452" />
-  <package id="Microsoft.Azure.PowerShell.Storage" version="1.0.96-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.PowerShell.Authentication.Abstractions" version="1.1.0-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.PowerShell.Common" version="1.1.0-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.PowerShell.ResourceManager" version="1.1.0-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.PowerShell.Storage" version="1.1.0-preview" targetFramework="net452" />
   <package id="Microsoft.Azure.Storage.DataMovement" version="0.8.1" targetFramework="net452" />
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net452" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />

tools/AzureRM/AzureRM.psm1

@@ -21,11 +21,11 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.Commands.ScenarioTest.Common, Version=1.0.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.ScenarioTest.ResourceManager.1.0.96-preview\lib\net452\Microsoft.Azure.Commands.ScenarioTest.Common.dll</HintPath>
+      <HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.ScenarioTest.ResourceManager.1.1.0-preview\lib\net452\Microsoft.Azure.Commands.ScenarioTest.Common.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.WindowsAzure.Commands.ServiceManagement.Common, Version=5.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.ServiceManagement.1.0.96-preview\lib\net452\Microsoft.WindowsAzure.Commands.ServiceManagement.Common.dll</HintPath>
+      <HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.ServiceManagement.1.1.0-preview\lib\net452\Microsoft.WindowsAzure.Commands.ServiceManagement.Common.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -66,7 +66,7 @@
     </Reference>
   </ItemGroup>
   <PropertyGroup>
-    <ScenarioTestToolsPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.ScenarioTest.ResourceManager.1.0.96-preview\tools\</ScenarioTestToolsPath>
+    <ScenarioTestToolsPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.ScenarioTest.ResourceManager.1.1.0-preview\tools\</ScenarioTestToolsPath>
   </PropertyGroup>
   <ItemGroup>
     <None Include="$(ScenarioTestToolsPath)Assert.ps1">