Build infra fix (#410)

* Build infra fix

* Updated build tools.

* Pulling in sdk project structure

* fixed build break in test code

* fixing yaml shmaml

* Added local feed and private httprecorder

* Fixed Linux builds

* fixed recordings

.travis.yml

@@ -15,8 +15,10 @@ install:
   - cat /etc/*release
   - sudo sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list'
   - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 417A0893
+  - wget -q https://packages.microsoft.com/config/ubuntu/14.04/packages-microsoft-prod.deb
+  - sudo dpkg -i packages-microsoft-prod.deb  
   - sudo apt-get update
-  - sudo apt-get install dotnet-dev-1.0.4 -y
+  - sudo apt-get install dotnet-sdk-2.1.201 -y
 script:
 - |-
   ./test_on_linux.sh || travis_terminate 1;

Directory.Build.props

@@ -1,42 +1,20 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <LibraryRoot>$(MSBuildThisFileDirectory)</LibraryRoot>
-    <LibrarySourceFolder>$(LibraryRoot)</LibrarySourceFolder>
-    <LibraryToolsFolder>$(LibraryRoot)tools</LibraryToolsFolder>	
-    <LibraryNugetPackageFolder>$(LibraryRoot)restoredPackages</LibraryNugetPackageFolder>
-    <LibraryFriendlyName>Microsoft Azure Management Libraries</LibraryFriendlyName>
-    <AuthenticationSolution>src\Authentication\Authentication.sln</AuthenticationSolution>
-    <ManagementLibrariesSolution>AzureManagementLibraries.sln</ManagementLibrariesSolution>
-    <BinariesFolder>$(LibraryRoot)binaries</BinariesFolder>
-	  <BuildAssetsDir>$(LibraryToolsFolder)\BuildAssets</BuildAssetsDir>
-    <PoliCheckOutputDir>$(LibraryRoot)PolicheckOutput</PoliCheckOutputDir>
-    <BuiltPackageOutputDir>$(BinariesFolder)\packages</BuiltPackageOutputDir>
-    <DelaySign Condition =" '$(DelaySign)' == '' ">false</DelaySign>
-    <CodeSign Condition=" '$(CodeSign)' == '' ">false</CodeSign>
-    <Scope Condition=" '$(Scope)' == '' ">All</Scope>
-    <NuGetCommand>&quot;$(LibraryToolsFolder)\nuget.exe&quot;</NuGetCommand>
-    <NuGetKey Condition=" '$(NuGetKey)' == '' ">1234</NuGetKey>
-    <BuildInParallel>true</BuildInParallel>
-	<SdkBuildToolsDir>$(LibraryToolsFolder)\SdkBuildTools</SdkBuildToolsDir>
-    <NugetPackageName/>
-    <ImportDirectoryBuildTargets>true</ImportDirectoryBuildTargets>
-  </PropertyGroup>
-  <PropertyGroup>
-    <CIToolsPath>$(OnPremiseBuildTasks)</CIToolsPath>
-    <OnPremiseBuild Condition=" Exists($(OnPremiseBuildTasks)) ">true</OnPremiseBuild>
-    <OnPremiseBuild Condition=" ! Exists($(OnPremiseBuildTasks)) ">false</OnPremiseBuild>
-  </PropertyGroup>
-
-  <PropertyGroup>
-	  <NetSdkBuildTargetsDir Condition=" Exists('$(BuildAssetsDir)') ">$(BuildAssetsDir)\targets</NetSdkBuildTargetsDir>
-	  <NetSdkBuildTargetsDir Condition=" Exists('$(SdkBuildToolsDir)') AND '$(NetSdkBuildTargetsDir)' == '' ">$(SdkBuildToolsDir)\targets</NetSdkBuildTargetsDir>
-	  <!-- <NetSdkBuildTargetsDir Condition=" '$(NetSdkBuildTargetsDir)' == '' ">$(LibraryToolsFolder)\buildTargets</NetSdkBuildTargetsDir> -->
+	<PropertyGroup>
+		<LibraryRoot>$(MSBuildThisFileDirectory)</LibraryRoot>
+		<LibraryToolsFolder>$(LibraryRoot)tools</LibraryToolsFolder>
+		<BuildAssetsDir>$(LibraryToolsFolder)\BuildAssets</BuildAssetsDir>
+		<SdkBuildToolsDir>$(LibraryToolsFolder)\SdkBuildTools</SdkBuildToolsDir>
+	</PropertyGroup>
+	<PropertyGroup>
+		<NetSdkBuildTargetsDir Condition=" Exists('$(BuildAssetsDir)') ">$(BuildAssetsDir)\targets</NetSdkBuildTargetsDir>
+		<NetSdkBuildTargetsDir Condition=" Exists('$(SdkBuildToolsDir)') AND '$(NetSdkBuildTargetsDir)' == '' ">$(SdkBuildToolsDir)\targets</NetSdkBuildTargetsDir>		
+		<NetSdkBuildToolsDir Condition=" Exists('$(BuildAssetsDir)') ">$(BuildAssetsDir)</NetSdkBuildToolsDir>
+		<NetSdkBuildToolsDir Condition=" Exists('$(SdkBuildToolsDir)') AND '$(NetSdkBuildToolsDir)' == '' ">$(SdkBuildToolsDir)</NetSdkBuildToolsDir>
+	</PropertyGroup>
+
+	<Import Project="$(NetSdkBuildTargetsDir)\core\_Directory.Build.props" Condition=" Exists('$(NetSdkBuildTargetsDir)\core\_Directory.Build.props') "/>
 
-	  <NetSdkBuildToolsDir Condition="Exists('$(BuildAssetsDir)')">$(BuildAssetsDir)</NetSdkBuildToolsDir>
-	  <NetSdkBuildToolsDir Condition="Exists('$(SdkBuildToolsDir)')">$(SdkBuildToolsDir)</NetSdkBuildToolsDir>
-	  <!-- <NetSdkBuildToolsDir Condition=" '$(NetSdkBuildToolsDir)' == '' ">$(LibraryToolsFolder)\buildTargets</NetSdkBuildToolsDir> -->
-  </PropertyGroup>
-
-	<Import Condition="Exists('$(NetSdkBuildTargetsDir)\common.Build.props')" Project="$(NetSdkBuildTargetsDir)\common.Build.props"/>
-	<Import Condition="Exists('$(NetSdkBuildTargetsDir)\common.NugetPackage.props')" Project="$(NetSdkBuildTargetsDir)\common.NugetPackage.props"/>
+	<PropertyGroup>
+    		<LibrarySourceFolder>$(LibraryRoot)</LibrarySourceFolder>
+	</PropertyGroup>		
 </Project>

Directory.Build.targets

@@ -1,5 +1,4 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<Import Condition="Exists('$(NetSdkBuildTargetsDir)\common.targets')" Project="$(NetSdkBuildTargetsDir)\common.targets" />
-	<Import Condition="Exists('$(NetSdkBuildTargetsDir)\ideCmd.targets')" Project="$(NetSdkBuildTargetsDir)\ideCmd.targets" />
+	<Import Project="$(NetSdkBuildTargetsDir)\core\_Directory.Build.targets" Condition=" Exists('$(NetSdkBuildTargetsDir)\core\_Directory.Build.targets') "/>
 	<Import Project="tools\bootstrapTools\bootstrap.targets" />
 </Project>

NuGet.Config

@@ -2,6 +2,7 @@
 <configuration>
   <packageSources>
     <!-- To Enable LocalFeed for testing uncomment the following line -->
-    <!-- <add key="Local" value="./tools/LocalFeed" /> -->
+    <add key="NugetOfficialV3" value="https://api.nuget.org/v3/index.json" />
+    <add key="Local" value="tools/LocalNugetFeed" />
   </packageSources>
 </configuration>

Tests/AzSdk.test.reference.props

@@ -3,6 +3,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.10" />
     <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.3.2" />
+    <PackageReference Include="Microsoft.Azure.Test.HttpRecorder" Version="[1.10.99-Private]" />
     <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version="1.7.2" />
     <PackageReference Include="SSH.NET" Version="2016.0.0" />
     <PackageReference Include="WindowsAzure.Storage" Version="8.1.4" />

Tests/Fluent.Tests/Fluent.Tests.csproj

@@ -8,10 +8,9 @@
     <VersionPrefix>1.0.0</VersionPrefix>
   </PropertyGroup>
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
-    <TestProjectType>true</TestProjectType>
+    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
-
+  
   <ItemGroup>  
     <PackageReference Include="CoreFtp" Version="1.4.0" />
   </ItemGroup>