Skip to content

Commit a68cab2

Browse files
JakeRadMSFTJakeRadMSFT
committed
Remove $(TestTargetFramework) related things
1 parent 4157319 commit a68cab2

File tree

4 files changed

+6
-16
lines changed

4 files changed

+6
-16
lines changed

‎build/ci/job-template.yml‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ parameters:
1313
container: ''
1414
useVSTestTask: false
1515
helixQueue: ''
16-
testTargetFramework: ''
1716

1817
jobs:
1918
- job: ${{ parameters.name }}
@@ -43,7 +42,6 @@ jobs:
4342
hardLink: ''
4443
${{ if eq(parameters.codeCoverage, 'false') }}:
4544
hardLink: '/p:CreateHardLinksForCopyLocalIfPossible=True'
46-
testTargetFramework: '/p:TestTargetFramework=$(_targetFramework)'
4745
CODECOV_TOKEN: 03031e35-fe75-4e4c-87ee-e919ae601748
4846
strategy:
4947
matrix:
@@ -52,12 +50,10 @@ jobs:
5250
_configuration: Debug
5351
_config_short: D
5452
_includeBenchmarkData: false
55-
_targetFramework: net8.0
5653
Release_Build:
5754
_configuration: Release
5855
_config_short: R
5956
_includeBenchmarkData: true
60-
_targetFramework: net8.0
6157
${{ if ne(parameters.customMatrixes, '') }}:
6258
${{ insert }}: ${{ parameters.customMatrixes }}
6359

@@ -77,7 +73,7 @@ jobs:
7773
- ${{ if and( eq(parameters.nightlyBuild, 'true'), eq(parameters.pool.vmImage, 'ubuntu-18.04')) }}:
7874
- bash: echo "##vso[task.setvariable variable=LD_LIBRARY_PATH]$(nightlyBuildRunPath):$LD_LIBRARY_PATH"
7975
displayName: Set LD_LIBRARY_PATH for Ubuntu and CentOS to locate Native shared library in current running path
80-
- script: ${{ parameters.buildScript }} -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} /p:Coverage=${{ parameters.codeCoverage }} $(testTargetFramework) /p:CreateHardLinksForCopyFilesToOutputDirectoryIfPossible=True $(hardLink)
76+
- script: ${{ parameters.buildScript }} -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} /p:Coverage=${{ parameters.codeCoverage }} /p:CreateHardLinksForCopyFilesToOutputDirectoryIfPossible=True $(hardLink)
8177
displayName: Build
8278
- ${{ if eq(parameters.pool.vmImage, 'macOS-10.15') }}:
8379
- task: Bash@3
@@ -115,17 +111,17 @@ jobs:
115111
Remove-Item -force
116112
Write-Output "Done cleaning up usless project..."
117113
displayName: Clean up useless project
118-
- script: $(dotnetPath) msbuild -restore $(nightlyBuildProjPath) /p:ReferenceTypeForTestFramework="Nuget" /p:Configuration=$(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} $(testTargetFramework)
114+
- script: $(dotnetPath) msbuild -restore $(nightlyBuildProjPath) /p:ReferenceTypeForTestFramework="Nuget" /p:Configuration=$(_configuration) /p:TargetArchitecture=${{ parameters.architecture }}
119115
displayName: Build Nightly-Build Project with latest package versions
120-
- script: $(dotnetPath) msbuild $(runNightlyBuildProj) /t:RunNightlyBuildTests /p:Configuration=$(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} $(testTargetFramework)
116+
- script: $(dotnetPath) msbuild $(runNightlyBuildProj) /t:RunNightlyBuildTests /p:Configuration=$(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }}
121117
displayName: Run Nightly Build Tests
122118
- ${{ if eq(parameters.nightlyBuild, 'false') }}:
123119
- ${{ if eq(parameters.innerLoop, 'false') }}:
124120
- ${{ if and(eq(parameters.runSpecific, 'false'), eq(parameters.useVSTestTask, 'false')) }}:
125-
- script: set PATH=%PATH%;%USERPROFILE%\.nuget\packages\libtorch-cpu-win-x64\1.13.0.1\runtimes\win-x64\native;%USERPROFILE%\.nuget\packages\torchsharp\0.99.5\runtimes\win-x64\native & ${{ parameters.buildScript }} /p:Build=false -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} -test -integrationTest /p:Coverage=${{ parameters.codeCoverage }} $(testTargetFramework)
121+
- script: set PATH=%PATH%;%USERPROFILE%\.nuget\packages\libtorch-cpu-win-x64\1.13.0.1\runtimes\win-x64\native;%USERPROFILE%\.nuget\packages\torchsharp\0.99.5\runtimes\win-x64\native & ${{ parameters.buildScript }} /p:Build=false -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} -test -integrationTest /p:Coverage=${{ parameters.codeCoverage }}
126122
displayName: Run All Tests.
127123
- ${{ if and(eq(parameters.runSpecific, 'true'), eq(parameters.useVSTestTask, 'false')) }}:
128-
- script: ${{ parameters.buildScript }} /p:Build=false -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} -test -integrationTest /p:TestRunnerAdditionalArguments='-trait$(spaceValue)Category=RunSpecificTest' /p:Coverage=${{ parameters.codeCoverage }} $(testTargetFramework)
124+
- script: ${{ parameters.buildScript }} /p:Build=false -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} -test -integrationTest /p:TestRunnerAdditionalArguments='-trait$(spaceValue)Category=RunSpecificTest' /p:Coverage=${{ parameters.codeCoverage }}
129125
displayName: Run Specific Tests.
130126
- ${{ if and(eq(parameters.buildScript, 'build.cmd'), eq(parameters.useVSTestTask, 'true')) }}:
131127
- task: VSTest@2
@@ -150,7 +146,7 @@ jobs:
150146
publishRunAttachments: true
151147
- ${{ if eq(parameters.innerLoop, 'true') }}:
152148
- ${{ if eq(parameters.codeCoverage, True) }}:
153-
- script: ${{ parameters.buildScript }} /p:Build=false -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} -test -integrationTest /p:TestRunnerAdditionalArguments='-notrait$(spaceValue)Category=SkipInCI' /p:Coverage=${{ parameters.codeCoverage }} $(testTargetFramework)
149+
- script: ${{ parameters.buildScript }} /p:Build=false -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} -test -integrationTest /p:TestRunnerAdditionalArguments='-notrait$(spaceValue)Category=SkipInCI' /p:Coverage=${{ parameters.codeCoverage }}
154150
displayName: Run CI Tests.
155151
- ${{ if eq(parameters.codeCoverage, False) }}:
156152
- template: /build/ci/send-to-helix.yml
@@ -161,11 +157,9 @@ jobs:
161157
${{ if eq(parameters.buildScript, 'build.cmd') }}:
162158
MsBuildScript: 'powershell $(Build.SourcesDirectory)/eng/common/msbuild.ps1'
163159
WarnAsError: '-warnAsError 0'
164-
TestTargetFramework: '$(testTargetFramework)'
165160
${{ if eq(parameters.buildScript, './build.sh') }}:
166161
MsBuildScript: '$(Build.SourcesDirectory)/eng/common/msbuild.sh'
167162
WarnAsError: '--warnAsError false'
168-
TestTargetFramework: '$(testTargetFramework)'
169163
# Don't have M1 failures fail the build for now.
170164
${{ if and(contains(parameters.pool.vmImage, 'macOS'), contains(parameters.name, 'cross')) }}:
171165
continueOnError: true

‎build/ci/send-to-helix.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ parameters:
99
Architecture: 'x64'
1010
MsBuildScript: ''
1111
WarnAsError: ''
12-
TestTargetFramework: ''
1312
HelixConfiguration: '' # optional -- additional property attached to a job
1413
IncludeDotNetCli: true # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion
1514
EnableXUnitReporter: true # optional -- true enables XUnit result reporting to Mission Control
@@ -39,7 +38,6 @@ steps:
3938
/p:WaitForWorkItemCompletion=${{ parameters.WaitForWorkItemCompletion }}
4039
/p:HelixBaseUri=${{ parameters.HelixBaseUri }}
4140
${{ parameters.WarnAsError }}
42-
${{ parameters.TestTargetFramework }}
4341
displayName: ${{ parameters.DisplayNamePrefix }}
4442
env:
4543
SYSTEM_ACCESSTOKEN: $(System.AccessToken)

‎eng/helix.proj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@
149149
<PayloadDirectory>$(BUILD_SOURCESDIRECTORY)\artifacts\bin\%(ProjectsWithTargetFramework.Filename)\$(BuildConfig)\%(ProjectsWithTargetFramework.TargetFrameworks)\</PayloadDirectory>
150150
<PayloadDirectory Condition="%(ProjectsWithTargetFramework.TargetFrameworks) == 'net461'">$(BUILD_SOURCESDIRECTORY)\artifacts\bin\%(ProjectsWithTargetFramework.Filename)\$(BuildConfig)\%(ProjectsWithTargetFramework.TargetFrameworks)\win-x64</PayloadDirectory>
151151
<Command>dotnet exec --roll-forward Major --runtimeconfig %(ProjectsWithTargetFramework.Filename).runtimeconfig.json --depsfile %(ProjectsWithTargetFramework.Filename).deps.json $(HelixCorrelationPayloadPath)/xunit-runner/tools/netcoreapp2.0/xunit.console.dll %(ProjectsWithTargetFramework.Filename).dll -notrait Category=SkipInCI -xml testResults.xml</Command>
152-
<Command Condition="$(TestTargetFramework.EndsWith('net461')) And %(ProjectsWithTargetFramework.TargetFrameworks) != 'net8.0'">$(HelixCorrelationPayloadPath)/xunit-runner/tools/net461/xunit.console.exe %(ProjectsWithTargetFramework.Filename).dll -notrait Category=SkipInCI -xml testResults.xml</Command>
153152
<Timeout>01:00:00</Timeout>
154153
<Timeout Condition="$(HelixTargetQueues.ToLowerInvariant().Contains('osx'))">00:30:00</Timeout>
155154
<Timeout Condition="'$(WorkItemTimeout)' != ''">$(WorkItemTimeout)</Timeout>

‎test/Directory.Build.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
<PropertyGroup>
55
<TargetFrameworks>net8.0</TargetFrameworks>
6-
<TargetFrameworks Condition="'$(TestTargetFramework)' != ''">$(TestTargetFramework)</TargetFrameworks>
76
<IsTestProject>true</IsTestProject>
87
<IsPackable>false</IsPackable>
98
<GenerateDocumentationFile>true</GenerateDocumentationFile>

0 commit comments

Comments
 (0)