Skip to content

Commit

Permalink
update tools package to the latest version with bug fixes (Azure#6937)
Browse files Browse the repository at this point in the history
* update tools package to the latest version with bug fixes

* adding comments

* increasing mgmt sdk pr validation timeout to 120 minutes

* updating package, fixing clientruntime tests
  • Loading branch information
shahabhijeet authored Jul 18, 2019
1 parent 163e4f7 commit a3d7eb2
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 20 deletions.
6 changes: 4 additions & 2 deletions eng/mgmt/Directory.Build.Mgmt.props
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<PkgVersion>0.10.0</PkgVersion>
<PkgVersion>0.12.0-dev.20190718.1</PkgVersion>
<PkgLocalDir>$(RepoRoot)\restoredPackages\microsoft.internal.netsdkbuild.mgmt.tools\$(PkgVersion)\Sdk</PkgLocalDir>
</PropertyGroup>

<!-- during execution of tasks tests, this conditional import will satisfy the import resolution. And you will have to manually execute a target to restore the package
Again this is strickly for build tools tests that will be run against this repo -->
<Import Condition="Exists($(PkgLocalDir))" Project="$(PkgLocalDir)\CI.Bootstrap.targets" />
<Import Condition="!Exists($(PkgLocalDir))" Project="CI.Bootstrap.targets" Sdk="Microsoft.Internal.NetSdkBuild.Mgmt.Tools" Version="0.10.0" />
<Import Condition="!Exists($(PkgLocalDir))" Project="CI.Bootstrap.targets" Sdk="Microsoft.Internal.NetSdkBuild.Mgmt.Tools" Version="0.12.0-dev.20190718.1" />
<Import Project="$(RepoRoot)\tools\bootstrapTools\bootstrap.targets" />
<PropertyGroup>
<SignAssembly>true</SignAssembly>
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/mgmt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ variables:
msBuildLogDir: msbuildlogs
loggingArgs: '/clp:ShowtimeStamp /flp:LogFile=$(msBuildLogDir)/msbuild.normal.log;Verbosity=normal /flp1:Summary;Verbosity=minimal;LogFile=$(msBuildLogDir)/msbuild.sum.log /flp2:warningsonly;logfile=$(msBuildLogDir)/msbuild.wrn.log /flp3:errorsonly;logfile=$(msBuildLogDir)/msbuild.err.log'
RPScopeArgs: '/p:PullRequestNumber=$(system.pullrequest.pullrequestnumber) /p:RepoHtmlUrl=https://github.com/$(build.repository.id) /p:CIBuildId=$(OfficialBuildId)'
timeoutInMinutes: 120

jobs:
- template: templates/jobs/archetype-sdk-mgmt.yml
Expand Down
7 changes: 7 additions & 0 deletions sdk/mgmtcommon/AzSdk.RP.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!--This file and it's contents are updated at build time moving or editing might result in build failure. Take due deligence while editing this file-->
<PropertyGroup>
<AzureApiTag />
<PackageTags>$(PackageTags);$(CommonTags);$(AzureApiTag);</PackageTags>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
<PropertyGroup>
<TargetFramework>net452</TargetFramework>
</PropertyGroup>
<PropertyGroup>
<ExcludeFromTest>false</ExcludeFromTest>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\TestCommon\ClientRuntime.Test.Common.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,36 +7,34 @@
<PackageTags>Microsoft AutoRest ClientRuntime REST</PackageTags>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworks>netcoreapp2.0</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
</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.7.0" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.1" PrivateAssets="All" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.1" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\ClientRuntime\Microsoft.Rest.ClientRuntime.csproj" />
<!-- <ProjectReference Include="..\..\ClientRuntime\Microsoft.Rest.ClientRuntime.csproj" /> -->
<ProjectReference Include="..\TestCommon\ClientRuntime.Test.Common.csproj" />
</ItemGroup>

<ItemGroup>
<Compile Include="$(RepoEngPath)\mgmt\DisableTestRunParallel.cs" Link="DisableTestRunParallel.cs" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Net" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.WebRequest" />
<Reference Include="System.Runtime" />
<Reference Include="System.Runtime.Serialization" />
</ItemGroup>

<!--Do not remove until VS Test Tools fixes #472-->
<ItemGroup>

<!-- <ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup> -->

<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
<PackageReference Include="System.Net.Http" Version="4.3.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@
<ItemGroup>
<ProjectReference Include="..\..\ClientRuntime\Microsoft.Rest.ClientRuntime.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.1" PrivateAssets="All" />
</ItemGroup>
<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.7.0" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.1" PrivateAssets="All" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
Expand Down
Binary file not shown.
Binary file not shown.

0 comments on commit a3d7eb2

Please sign in to comment.