Respond to review comments and allow prebuild assemblies in cleanup build

Author: markcowl

.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 pack src/TestPrerequisites/Common.TestPrerequisites.sln --configuration $CONFIG || travis_terminate 1
  - sudo dotnet test src/Azure.PowerShell.Netcore.Test.sln --filter "AcceptanceType=CheckIn&RunType!=DesktopOnly" --configuration $CONFIG --framework netcoreapp2.0

src/ResourceManager/Aks/Commands.Aks/Commands.Aks.Netcore.csproj

@@ -12,7 +12,6 @@
     <OutputPath>$(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Aks\</OutputPath>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />
-    <Version>1.1.0.0</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

src/ResourceManager/Aks/Commands.Aks/Properties/AssemblyInfo.cs

@@ -23,5 +23,5 @@
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(false)]
 [assembly: Guid("a97e0c3e-e389-46a6-b73d-2b9bd6909bdb")]
-[assembly: AssemblyVersion("0.0.6")]
-[assembly: AssemblyFileVersion("0.0.6")]
+[assembly: AssemblyVersion("0.0.5")]
+[assembly: AssemblyFileVersion("0.0.5")]

src/ResourceManager/Sql/LegacySdk/SqlManagement.Netcore.csproj

@@ -4,6 +4,7 @@
     <OmitJsonPackage>true</OmitJsonPackage>
   </PropertyGroup>
 
+  <Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.targets" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -19,9 +20,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Common" Version="2.2.0" />
-    <PackageReference Include="Hyak.Common" Version="1.2.1" />
-    <PackageReference Include="PowerShellStandard.Library" Version="5.1.0-preview-06" PrivateAssets="All" />
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" PrivateAssets="all"/>
   </ItemGroup>
 

tools/CleanupBuild.ps1

@@ -66,7 +66,7 @@ foreach($RMPath in $resourceManagerPaths)
         }
 
         Write-Verbose "Removing redundant dlls in $($RMFolder.Name)"
-        $removedDlls = Get-ChildItem -Path $RMFolder.FullName -Filter "*.dll" -Recurse | where { $acceptedDlls -notcontains $_.Name}
+        $removedDlls = Get-ChildItem -Path $RMFolder.FullName -Filter "*.dll" -Recurse | where { $acceptedDlls -notcontains $_.Name -and !$_.FullName.Contains("PreloadAssemblies")}
         $removedDlls | % { Write-Verbose "Removing $($_.Name)"; Remove-Item $_.FullName -Force }
 
         Write-Verbose "Removing scripts and psd1 in $($RMFolder.FullName)"