Skip to content

Commit c0c1f9a

Browse files
hovsepmhovsepm
authored
Build infra fix (Azure#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
1 parent 19300ac commit c0c1f9a

17 files changed

+8735
-8908
lines changed

‎.travis.yml

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

‎Directory.Build.props

+17-39
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,20 @@
11
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<PropertyGroup>
3-
<LibraryRoot>$(MSBuildThisFileDirectory)</LibraryRoot>
4-
<LibrarySourceFolder>$(LibraryRoot)</LibrarySourceFolder>
5-
<LibraryToolsFolder>$(LibraryRoot)tools</LibraryToolsFolder>
6-
<LibraryNugetPackageFolder>$(LibraryRoot)restoredPackages</LibraryNugetPackageFolder>
7-
<LibraryFriendlyName>Microsoft Azure Management Libraries</LibraryFriendlyName>
8-
<AuthenticationSolution>src\Authentication\Authentication.sln</AuthenticationSolution>
9-
<ManagementLibrariesSolution>AzureManagementLibraries.sln</ManagementLibrariesSolution>
10-
<BinariesFolder>$(LibraryRoot)binaries</BinariesFolder>
11-
<BuildAssetsDir>$(LibraryToolsFolder)\BuildAssets</BuildAssetsDir>
12-
<PoliCheckOutputDir>$(LibraryRoot)PolicheckOutput</PoliCheckOutputDir>
13-
<BuiltPackageOutputDir>$(BinariesFolder)\packages</BuiltPackageOutputDir>
14-
<DelaySign Condition =" '$(DelaySign)' == '' ">false</DelaySign>
15-
<CodeSign Condition=" '$(CodeSign)' == '' ">false</CodeSign>
16-
<Scope Condition=" '$(Scope)' == '' ">All</Scope>
17-
<NuGetCommand>&quot;$(LibraryToolsFolder)\nuget.exe&quot;</NuGetCommand>
18-
<NuGetKey Condition=" '$(NuGetKey)' == '' ">1234</NuGetKey>
19-
<BuildInParallel>true</BuildInParallel>
20-
<SdkBuildToolsDir>$(LibraryToolsFolder)\SdkBuildTools</SdkBuildToolsDir>
21-
<NugetPackageName/>
22-
<ImportDirectoryBuildTargets>true</ImportDirectoryBuildTargets>
23-
</PropertyGroup>
24-
<PropertyGroup>
25-
<CIToolsPath>$(OnPremiseBuildTasks)</CIToolsPath>
26-
<OnPremiseBuild Condition=" Exists($(OnPremiseBuildTasks)) ">true</OnPremiseBuild>
27-
<OnPremiseBuild Condition=" ! Exists($(OnPremiseBuildTasks)) ">false</OnPremiseBuild>
28-
</PropertyGroup>
29-
30-
<PropertyGroup>
31-
<NetSdkBuildTargetsDir Condition=" Exists('$(BuildAssetsDir)') ">$(BuildAssetsDir)\targets</NetSdkBuildTargetsDir>
32-
<NetSdkBuildTargetsDir Condition=" Exists('$(SdkBuildToolsDir)') AND '$(NetSdkBuildTargetsDir)' == '' ">$(SdkBuildToolsDir)\targets</NetSdkBuildTargetsDir>
33-
<!-- <NetSdkBuildTargetsDir Condition=" '$(NetSdkBuildTargetsDir)' == '' ">$(LibraryToolsFolder)\buildTargets</NetSdkBuildTargetsDir> -->
2+
<PropertyGroup>
3+
<LibraryRoot>$(MSBuildThisFileDirectory)</LibraryRoot>
4+
<LibraryToolsFolder>$(LibraryRoot)tools</LibraryToolsFolder>
5+
<BuildAssetsDir>$(LibraryToolsFolder)\BuildAssets</BuildAssetsDir>
6+
<SdkBuildToolsDir>$(LibraryToolsFolder)\SdkBuildTools</SdkBuildToolsDir>
7+
</PropertyGroup>
8+
<PropertyGroup>
9+
<NetSdkBuildTargetsDir Condition=" Exists('$(BuildAssetsDir)') ">$(BuildAssetsDir)\targets</NetSdkBuildTargetsDir>
10+
<NetSdkBuildTargetsDir Condition=" Exists('$(SdkBuildToolsDir)') AND '$(NetSdkBuildTargetsDir)' == '' ">$(SdkBuildToolsDir)\targets</NetSdkBuildTargetsDir>
11+
<NetSdkBuildToolsDir Condition=" Exists('$(BuildAssetsDir)') ">$(BuildAssetsDir)</NetSdkBuildToolsDir>
12+
<NetSdkBuildToolsDir Condition=" Exists('$(SdkBuildToolsDir)') AND '$(NetSdkBuildToolsDir)' == '' ">$(SdkBuildToolsDir)</NetSdkBuildToolsDir>
13+
</PropertyGroup>
14+
15+
<Import Project="$(NetSdkBuildTargetsDir)\core\_Directory.Build.props" Condition=" Exists('$(NetSdkBuildTargetsDir)\core\_Directory.Build.props') "/>
3416

35-
<NetSdkBuildToolsDir Condition="Exists('$(BuildAssetsDir)')">$(BuildAssetsDir)</NetSdkBuildToolsDir>
36-
<NetSdkBuildToolsDir Condition="Exists('$(SdkBuildToolsDir)')">$(SdkBuildToolsDir)</NetSdkBuildToolsDir>
37-
<!-- <NetSdkBuildToolsDir Condition=" '$(NetSdkBuildToolsDir)' == '' ">$(LibraryToolsFolder)\buildTargets</NetSdkBuildToolsDir> -->
38-
</PropertyGroup>
39-
40-
<Import Condition="Exists('$(NetSdkBuildTargetsDir)\common.Build.props')" Project="$(NetSdkBuildTargetsDir)\common.Build.props"/>
41-
<Import Condition="Exists('$(NetSdkBuildTargetsDir)\common.NugetPackage.props')" Project="$(NetSdkBuildTargetsDir)\common.NugetPackage.props"/>
17+
<PropertyGroup>
18+
<LibrarySourceFolder>$(LibraryRoot)</LibrarySourceFolder>
19+
</PropertyGroup>
4220
</Project>

‎Directory.Build.targets

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

‎NuGet.Config

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<configuration>
33
<packageSources>
44
<!-- To Enable LocalFeed for testing uncomment the following line -->
5-
<!-- <add key="Local" value="./tools/LocalFeed" /> -->
5+
<add key="NugetOfficialV3" value="https://api.nuget.org/v3/index.json" />
6+
<add key="Local" value="tools/LocalNugetFeed" />
67
</packageSources>
78
</configuration>

‎Tests/AzSdk.test.reference.props

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<ItemGroup>
44
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.10" />
55
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.3.2" />
6+
<PackageReference Include="Microsoft.Azure.Test.HttpRecorder" Version="[1.10.99-Private]" />
67
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version="1.7.2" />
78
<PackageReference Include="SSH.NET" Version="2016.0.0" />
89
<PackageReference Include="WindowsAzure.Storage" Version="8.1.4" />

‎Tests/Fluent.Tests/Fluent.Tests.csproj

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@
88
<VersionPrefix>1.0.0</VersionPrefix>
99
</PropertyGroup>
1010
<PropertyGroup>
11-
<TargetFrameworks>netcoreapp1.1</TargetFrameworks>
12-
<TestProjectType>true</TestProjectType>
11+
<TargetFrameworks>netcoreapp2.0</TargetFrameworks>
1312
</PropertyGroup>
14-
13+
1514
<ItemGroup>
1615
<PackageReference Include="CoreFtp" Version="1.4.0" />
1716
</ItemGroup>

0 commit comments

Comments
 (0)