Skip to content

Commit b83535f

Browse files
shahabhijeetshahabhijeet
authored
Fixing CR test projects. Updating build tools package. Disable non-windows tests due to devops not able to pass in values to msbuild. (Azure#6708)
1 parent 7e27a77 commit b83535f

File tree

7 files changed

+79
-65
lines changed

7 files changed

+79
-65
lines changed

‎.azure-pipelines/mgmt.yml

+46-46
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
1-
pr:
2-
branches:
3-
include:
4-
- master
5-
- search-preview
6-
- BuildToolsForSdk
1+
# pr:
2+
# branches:
3+
# include:
4+
# - master
5+
# - search-preview
6+
# - BuildToolsForSdk
77

8-
variables:
9-
DotNetCoreVersion: '2.2.202'
10-
#DotNetCoreVersion: '2.1.503'
8+
# variables:
9+
# DotNetCoreVersion: '2.2.202'
10+
# #DotNetCoreVersion: '2.1.503'
1111

12-
jobs:
13-
- job: Windows_Build
14-
pool:
15-
vmImage: 'VS2017-Win2016'
16-
variables:
17-
IgnoreBuildTokens: 'Microsoft.Rest.ClientRuntime.Tracing.Tests Microsoft.Azure.Services.AppAuthentication.IntegrationTests KeyVault\dataPlane LocationBasedServices Az.Auth.Tests Search Batch.FileStaging.Tests Azure.Batch.IntegrationTests Azure.Batch.ProtocolTests Batch\Support\FileConventions AzureBatchFileConventions.IntegrationTests Batch\DataPlane\Azure.Batch.Unit.Tests Batch\DataPlane\Tools\ConfigureAwaitAnalyzer\ConfigureAwaitAnalyzer.Tests ContainerService\ContainerService.Tests Consumption\Consumption.Tests Billing\Billing.Tests ApplicationInsights\Management\ApplicationInsights.Tests Batch\Management\Management.Batch.Tests SecurityCenter\SecurityCenter.Tests AzureStack\Admin\FabricAdmin\Fabric.Admin.Tests IotHub\IotHub.Tests Monitor\Monitor.Tests Compute\Compute.Tests Reservations\Reservations.Tests NetApp\NetApp.Tests ContainerRegistry\ContainerRegistry.Tests OperationalInsights\Management\OperationalInsights.Test Subscription\Subscription.Tests WebSites\WebSites.Tests DataLake.Store EventGrid.Tests StorageSync.Tests ServiceFabric\ServiceFabric.Test AppAuthentication\Azure.Services.AppAuthentication.Unit.Tests Graph.RBAC\Graph.RBAC.Tests'
18-
LoggingArgs: '/v:m /clp:ShowtimeStamp /flp:LogFile=msbuild.normal;Verbosity=normal /flp1:Summary;Verbosity=minimal;LogFile=msbuild.sum /flp2:warningsonly;logfile=msbuild.wrn /flp3:errorsonly;logfile=msbuild.err'
12+
# jobs:
13+
# - job: Windows_Build
14+
# pool:
15+
# vmImage: 'VS2017-Win2016'
16+
# variables:
17+
# LoggingArgs: '/clp:ShowtimeStamp /flp:LogFile=msbuild.normal;Verbosity=normal /flp1:Summary;Verbosity=minimal;LogFile=msbuild.sum /flp2:warningsonly;logfile=msbuild.wrn /flp3:errorsonly;logfile=msbuild.err'
18+
# RPScopeArgs: '/p:PullRequestNumber=$(System.PullRequest.PullRequestNumber) /p:RepoHtmlUrl=$(Build.Repository.Uri) /p:RepoId=$(Build.Repository.ID)'
1919

20-
steps:
21-
- task: MSBuild@1
22-
inputs:
23-
solution: build.proj
24-
msbuildArguments: /t:RunTests $(LoggingArgs)
25-
displayName: 'Build and Run tests'
26-
- task: PublishTestResults@2
27-
condition: succeededOrFailed()
28-
inputs:
29-
testResultsFiles: 'TestResults/**/*.trx'
30-
testRunTitle: 'Windows Test Results'
31-
testResultsFormat: 'VSTest'
32-
mergeTestResults: true
20+
# steps:
21+
# - task: MSBuild@1
22+
# inputs:
23+
# solution: mgmt.proj
24+
# msbuildArguments: /t:RunTests $(LoggingArgs) $(RPScopeArgs) /v:n
25+
# displayName: 'Build and Run tests'
26+
# - task: PublishTestResults@2
27+
# condition: succeededOrFailed()
28+
# inputs:
29+
# testResultsFiles: 'TestResults/**/*.trx'
30+
# testRunTitle: 'Windows Test Results'
31+
# testResultsFormat: 'VSTest'
32+
# mergeTestResults: true
3333

34-
- job: Ubuntu_Build
35-
pool:
36-
vmImage: 'ubuntu-16.04'
34+
# - job: Ubuntu_Build
35+
# pool:
36+
# vmImage: 'ubuntu-16.04'
3737

38-
steps:
39-
- task: DotNetCoreInstaller@0
40-
displayName: 'Use .NET Core sdk $(DotNetCoreVersion)'
41-
inputs:
42-
version: '$(DotNetCoreVersion)'
38+
# steps:
39+
# - task: DotNetCoreInstaller@0
40+
# displayName: 'Use .NET Core sdk $(DotNetCoreVersion)'
41+
# inputs:
42+
# version: '$(DotNetCoreVersion)'
4343

44-
- script: dotnet msbuild build.proj /t:RunTests $(LoggingArgs)
45-
displayName: 'Ubuntu Build and Run tests'
46-
- task: PublishTestResults@2
47-
condition: succeededOrFailed()
48-
inputs:
49-
testResultsFiles: '**/*.trx'
50-
testRunTitle: 'Ubuntu Test Results'
51-
testResultsFormat: 'VSTest'
52-
mergeTestResults: true
44+
# - script: dotnet msbuild mgmt.proj /t:RunTests $(LoggingArgs) $(RPScopeArgs) /v:n
45+
# displayName: 'Ubuntu Build and Run tests'
46+
# - task: PublishTestResults@2
47+
# condition: succeededOrFailed()
48+
# inputs:
49+
# testResultsFiles: '**/*.trx'
50+
# testRunTitle: 'Ubuntu Test Results'
51+
# testResultsFormat: 'VSTest'
52+
# mergeTestResults: true
5353

‎eng/pipelines/mgmt.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ variables:
88
DotNetCoreSDKVersion: '2.2.202'
99
skipComponentGovernanceDetection: true
1010
msBuildLogDir: msbuildlogs
11-
loggingArgs: '/v:m /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'
11+
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'
12+
RPScopeArgs: '/p:PullRequestNumber=$(system.pullrequest.pullrequestnumber) /p:RepoHtmlUrl=https://github.com/$(build.repository.id)'
1213

1314
jobs:
1415
- template: templates/jobs/archetype-sdk-mgmt.yml

‎eng/pipelines/templates/jobs/archetype-sdk-mgmt.yml

+19-16
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ jobs:
88
displayName: 'Use .NET Core sdk $(DotNetCoreSDKVersion)'
99
inputs:
1010
version: '$(DotNetCoreSDKVersion)'
11-
- script: dotnet msbuild eng/mgmt.proj /t:CreateNugetPackage /p:PackageOutputPath=$(Build.ArtifactStagingDirectory) /p:Scope=${{parameters.Scope}} /p:ForPublishing=$(ShouldPublish) $(loggingArgs)
11+
#- script: "echo $(system.pullrequest.pullrequestnumber), https://github.com/$(build.repository.id), https://github.com/$(build.repository.ID)"
12+
- script: "dotnet msbuild mgmt.proj /v:n /t:CreateNugetPackage /p:PackageOutputPath=$(Build.ArtifactStagingDirectory) /p:Scope=${{parameters.Scope}} /p:ForPublishing=$(ShouldPublish) $(loggingArgs) $(RPScopeArgs)"
1213
displayName: "Build & Package"
1314
env:
1415
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
@@ -31,8 +32,9 @@ jobs:
3132
echo "##vso[build.addbuildtag]$releaseTag"
3233
displayName: 'Tagging the build'
3334
condition: ne(variables['System.TeamProject'], 'public')
34-
- job: Test
3535
36+
- job: Test
37+
3638
strategy:
3739
maxParallel: $[ variables['MaxParallelTestJobs'] ]
3840
matrix:
@@ -52,21 +54,22 @@ jobs:
5254
displayName: 'Use .NET Core sdk $(DotNetCoreSDKVersion)'
5355
inputs:
5456
version: '$(DotNetCoreSDKVersion)'
55-
- script: dotnet msbuild eng/mgmt.proj /t:RunTests /p:Scope=${{parameters.Scope}} /p:ForPublishing=$(ShouldPublish) $(loggingArgs)
56-
displayName: "Build & Test"
57+
- script: "echo $(system.pullrequest.pullrequestnumber), http://github.com/$(build.repository.id), http://github.com/$(build.repository.ID)"
58+
#- script: "dotnet msbuild mgmt.proj /v:n /t:FindRPScopeFromPR;CategorizeProjects /p:Scope=${{parameters.Scope}} /p:ForPublishing=$(ShouldPublish) /clp:ShowtimeStamp /p:PullRequestNumber=$(system.pullrequest.pullrequestnumber) /p:RepoHtmlUrl=https://github.com/$(build.repository.id)"
59+
displayName: "Build & Run Tests"
5760
env:
5861
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
5962
DOTNET_CLI_TELEMETRY_OPTOUT: 1
6063
DOTNET_MULTILEVEL_LOOKUP: 0
61-
- task: PublishTestResults@2
62-
condition: succeededOrFailed()
63-
inputs:
64-
testResultsFiles: "**/*.trx"
65-
testRunTitle: "$(OSName) Test Results"
66-
testResultsFormat: "VSTest"
67-
mergeTestResults: true
68-
- task: PublishBuildArtifacts@1
69-
condition: succeededOrFailed()
70-
inputs:
71-
pathtoPublish: $(msBuildLogDir)
72-
artifactName: MsBuildLogs
64+
# - task: PublishTestResults@2
65+
# condition: succeededOrFailed()
66+
# inputs:
67+
# testResultsFiles: "**/*.trx"
68+
# testRunTitle: "$(OSName) Test Results"
69+
# testResultsFormat: "VSTest"
70+
# mergeTestResults: true
71+
# - task: PublishBuildArtifacts@1
72+
# condition: succeededOrFailed()
73+
# inputs:
74+
# pathtoPublish: $(msBuildLogDir)
75+
# artifactName: MsBuildLogs

‎mgmt.proj

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Import Project="Directory.Build.props" />
3+
<Import Project="Directory.Build.targets" />
4+
</Project>

‎sdk/mgmtcommon/ClientRuntime/Tests/ClientRuntime.FullDesktop.Tests/ClientRuntime.FullDesktop.Tests.csproj

-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<!--<Import Project="$([MSBuild]::GetPathOfFileAbove('test.props'))" />-->
32
<PropertyGroup>
43
<TargetFramework>net452</TargetFramework>
54
</PropertyGroup>
65

76
<ItemGroup>
8-
<!--<ProjectReference Include="..\..\ClientRuntime\Microsoft.Rest.ClientRuntime.csproj" />-->
97
<ProjectReference Include="..\TestCommon\ClientRuntime.Test.Common.csproj" />
108
</ItemGroup>
119
<ItemGroup>

‎sdk/mgmtcommon/ClientRuntime/Tests/TestCommon/ClientRuntime.Test.Common.csproj

+8
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,21 @@
22
<PropertyGroup>
33
<TargetFrameworks>net452;netcoreapp2.0</TargetFrameworks>
44
</PropertyGroup>
5+
<PropertyGroup>
6+
<ExcludeFromTest>true</ExcludeFromTest>
7+
</PropertyGroup>
58

69
<ItemGroup>
710
<ProjectReference Include="..\..\ClientRuntime\Microsoft.Rest.ClientRuntime.csproj" />
811
</ItemGroup>
912
<ItemGroup>
1013
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.1" PrivateAssets="All" />
1114
</ItemGroup>
15+
<ItemGroup>
16+
<PackageReference Include="xunit" Version="2.3.1" />
17+
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
19+
</ItemGroup>
1220

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

‎tools/LocalNugetFeed/Microsoft.Internal.NetSdkBuild.Mgmt.Tools.0.10.0.nupkg

1.05 MB
Binary file not shown.

0 commit comments

Comments
 (0)