forked from Azure/azure-sdk-for-net
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Updating build files to accomodate latest updates of separating build…
… files out of main branch. Adding signed build tasks binaries. Updating bash script for similar changes needed for travis. (Azure#4394)
- Loading branch information
1 parent
8e7f2ff
commit dfeb2c9
Showing
6 changed files
with
29 additions
and
84 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,47 +1,16 @@ | ||
| <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup> | ||
| <LibraryRoot>$(MSBuildThisFileDirectory)</LibraryRoot> | ||
| <LibrarySourceFolder>$(LibraryRoot)src</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>"$(LibraryToolsFolder)\nuget.exe"</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 Label="Well Known Properties"> | ||
| <ClientRuntimeRootDir>$(LibraryRoot)src\UpgradeVS17\SdkCommon\ClientRuntime</ClientRuntimeRootDir> | ||
| <SdkCommonRootDir>$(LibraryRoot)src\UpgradeVS17\SdkCommon\ClientRuntime</SdkCommonRootDir> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <NetSdkBuildTargetsDir Condition=" Exists('$(BuildAssetsDir)') ">$(BuildAssetsDir)\targets</NetSdkBuildTargetsDir> | ||
| <NetSdkBuildTargetsDir Condition=" Exists('$(SdkBuildToolsDir)') AND '$(NetSdkBuildTargetsDir)' == '' ">$(SdkBuildToolsDir)\targets</NetSdkBuildTargetsDir> | ||
| <!-- <NetSdkBuildTargetsDir Condition=" '$(NetSdkBuildTargetsDir)' == '' ">$(LibraryToolsFolder)\buildTargets</NetSdkBuildTargetsDir> --> | ||
|
|
||
| <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> | ||
| <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') "/> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,7 @@ | ||
| <Project DefaultTargets="Init" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Project DefaultTargets="Init" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Import Project="Directory.Build.props" /> | ||
| <Import Project="test.props" /> | ||
| <Import Project="AzSdk.props" /> | ||
| <Import Project="Directory.Build.targets" /> | ||
|
|
||
| <Target Name="Clean" DependsOnTargets="$(CleanTraversedProjectsDependsOn)" /> | ||
| <Target Name="Restore" DependsOnTargets="$(RestoreTraversedProjectsDependsOn)" /> | ||
| <Target Name="Build" DependsOnTargets="$(BuildTraversedProjectsDependsOn)" /> | ||
| <Target Name="Rebuild" DependsOnTargets="Clean;Build" /> | ||
| <Target Name="PublishNuget" DependsOnTargets="$(PublishNugetDependsOn)" /> | ||
| <Target Name="CreateNugetPackage" DependsOnTargets="$(PackageNugetDependsOn)" /> | ||
| <Target Name="RunTests" DependsOnTargets="$(RunTestProjectsDependsOn)" /> | ||
| <Target Name="SignNuget" DependsOnTargets="$(SignNugetDependsOn)" /> | ||
| <Target Name="Help" DependsOnTargets="$(HelpDependsOn)" /> | ||
| </Project> | ||
| <Import Project="$(NetSdkBuildTargetsDir)\core\_build.proj" Condition=" Exists('$(NetSdkBuildTargetsDir)\core\_build.proj') "/> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,3 @@ | ||
| <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup> | ||
| <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| <RestorePackagesPath>$(LibraryNugetPackageFolder)</RestorePackagesPath> | ||
| <NugetCommonProfileTags/> | ||
| <PackageOutputPath>$(BuiltPackageOutputDir)</PackageOutputPath> | ||
| <AddProjectReferenceForDebuggingPurpose>false</AddProjectReferenceForDebuggingPurpose> | ||
| <AddNugetReferenceForCIandCmdlineBuild>true</AddNugetReferenceForCIandCmdlineBuild> | ||
| <SkipBuildingTestProject>false</SkipBuildingTestProject> | ||
| <SignAssembly>true</SignAssembly> | ||
| <DelaySign>true</DelaySign> | ||
| <AssemblyOriginatorKeyFile>$(LibraryToolsFolder)\MSSharedLibKey.snk</AssemblyOriginatorKeyFile> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="xunit" Version="2.3.1" /> | ||
| <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" /> | ||
| <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Compile Include="$(LibraryToolsFolder)\DisableTestRunParallel.cs" Link="DisableTestRunParallel.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" /> | ||
| </ItemGroup> | ||
| <Import Project="$(NetSdkBuildTargetsDir)\core\_test.props" Condition=" Exists('$(NetSdkBuildTargetsDir)\core\_test.props') "/> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
+0 Bytes
(100%)
tools/bootstrapTools/taskBinaries/Microsoft.Azure.Build.BootstrapTasks.dll
Binary file not shown.