Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update tools package to the latest version with bug fixes #6937

Merged
merged 4 commits into from
Jul 18, 2019
Merged

update tools package to the latest version with bug fixes #6937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6eea9ea
update tools package to the latest version with bug fixes
Jul 15, 2019
0f8bd35
adding comments
Jul 16, 2019
e85183e
increasing mgmt sdk pr validation timeout to 120 minutes
Jul 16, 2019
7ef46e8
updating package, fixing clientruntime tests
Jul 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions eng/mgmt/Directory.Build.Mgmt.props
View file
Open in desktop
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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that I've got the release pipeline working and publishing for these tools can you please go ahead and update this version to the latest published (0.12.0-dev.20190716.14) and delete the package? If so I'll go ahead and close my PR #6879 instead of us fighting which one merges first :)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@weshaggard I am going to ask @erich-wang to open a new PR to get rid of the checked in package.
This would be a good way for him to update these tools package on his own.

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
View file
Open in desktop
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
View file
Open in desktop
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>
3 changes: 3 additions & 0 deletions ...lientRuntime/Tests/ClientRuntime.FullDesktop.Tests/ClientRuntime.FullDesktop.Tests.csproj
View file
Open in desktop
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
28 changes: 13 additions & 15 deletions ...common/ClientRuntime/Tests/ClientRuntime.NetCore.Tests/ClientRuntime.NetCore.Tests.csproj
View file
Open in desktop
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>
5 changes: 2 additions & 3 deletions sdk/mgmtcommon/ClientRuntime/Tests/TestCommon/ClientRuntime.Test.Common.csproj
View file
Open in desktop
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 removed tools/LocalNugetFeed/Microsoft.Internal.NetSdkBuild.Mgmt.Tools.0.10.0.nupkg
View file
Open in desktop
Binary file not shown.
Binary file added tools/LocalNugetFeed/Microsoft.Internal.NetSdkBuild.Mgmt.Tools.0.12.0-dev.20190718.1.nupkg
View file
Open in desktop
Binary file not shown.