Skip to content

Commit cdd67c7

Browse files
authored
Fix package version checking in CI, cleanup PR yaml (#17197)
1 parent 3e1f9e7 commit cdd67c7

File tree

2 files changed

+3
-162
lines changed

2 files changed

+3
-162
lines changed

azure-pipelines-PR.yml

Lines changed: 2 additions & 161 deletions
Original file line numberDiff line numberDiff line change
@@ -78,109 +78,6 @@ stages:
7878
displayName: Build
7979
jobs:
8080

81-
#-------------------------------------------------------------------------------------------------------------------#
82-
# Signed build #
83-
#-------------------------------------------------------------------------------------------------------------------#
84-
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
85-
- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/release/dev17.9') }}:
86-
- template: /eng/common/templates/job/onelocbuild.yml
87-
parameters:
88-
MirrorRepo: fsharp
89-
MirrorBranch: release/dev17.9
90-
LclSource: lclFilesfromPackage
91-
LclPackageId: 'LCL-JUNO-PROD-FSHARP'
92-
- template: /eng/common/templates/jobs/jobs.yml
93-
parameters:
94-
enableMicrobuild: true
95-
enablePublishBuildArtifacts: true
96-
enablePublishTestResults: false
97-
enablePublishBuildAssets: true
98-
enablePublishUsingPipelines: $(_PublishUsingPipelines)
99-
enableSourceBuild: true
100-
enableTelemetry: true
101-
helixRepo: dotnet/fsharp
102-
jobs:
103-
- job: Full_Signed
104-
pool:
105-
name: $(DncEngInternalBuildPool)
106-
demands: ImageOverride -equals windows.vs2022preview.amd64
107-
timeoutInMinutes: 300
108-
variables:
109-
- group: DotNet-Symbol-Server-Pats
110-
- group: DotNet-DevDiv-Insertion-Workflow-Variables
111-
- name: _SignType
112-
value: Real
113-
steps:
114-
- checkout: self
115-
clean: true
116-
- template: /eng/restore-internal-tools.yml
117-
- script: eng\CIBuild.cmd
118-
-configuration $(_BuildConfig)
119-
-prepareMachine
120-
-testAllButIntegration
121-
-officialSkipTests $(SkipTests)
122-
/p:SignType=$(_SignType)
123-
/p:DotNetSignType=$(_SignType)
124-
/p:MicroBuild_SigningEnabled=true
125-
/p:TeamName=$(_TeamName)
126-
/p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines)
127-
/p:OfficialBuildId=$(BUILD.BUILDNUMBER)
128-
/p:VisualStudioDropName=$(VisualStudioDropName)
129-
/p:GenerateSbom=true
130-
env:
131-
NativeToolsOnMachine: true
132-
- script: .\tests\EndToEndBuildTests\EndToEndBuildTests.cmd -c $(_BuildConfig)
133-
displayName: End to end build tests
134-
continueOnError: true
135-
condition: always()
136-
- task: PublishTestResults@2
137-
displayName: Publish Test Results
138-
inputs:
139-
testResultsFormat: 'NUnit'
140-
testResultsFiles: '*.xml'
141-
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
142-
continueOnError: true
143-
condition: ne(variables['SkipTests'], 'true')
144-
- task: PublishBuildArtifacts@1
145-
displayName: Publish Test Logs
146-
inputs:
147-
PathtoPublish: '$(Build.SourcesDirectory)\artifacts\TestResults\$(_BuildConfig)'
148-
ArtifactName: 'Test Logs'
149-
publishLocation: Container
150-
continueOnError: true
151-
condition: ne(variables['SkipTests'], 'true')
152-
- task: PublishBuildArtifacts@1
153-
displayName: Publish Artifact Packages
154-
inputs:
155-
PathtoPublish: '$(Build.SourcesDirectory)\artifacts\packages\$(_BuildConfig)'
156-
ArtifactName: 'Packages'
157-
condition: succeeded()
158-
- task: PublishBuildArtifacts@1
159-
displayName: Publish Artifact VSSetup
160-
inputs:
161-
PathtoPublish: '$(Build.SourcesDirectory)\artifacts\VSSetup\$(_BuildConfig)\Insertion'
162-
ArtifactName: 'VSSetup'
163-
condition: succeeded()
164-
- task: PublishBuildArtifacts@1
165-
displayName: Publish Artifact Nightly
166-
inputs:
167-
PathtoPublish: '$(Build.SourcesDirectory)\artifacts\VSSetup\$(_BuildConfig)\VisualFSharpDebug.vsix'
168-
ArtifactName: 'Nightly'
169-
condition: succeeded()
170-
- task: PublishBuildArtifacts@1
171-
displayName: Publish Artifact Symbols
172-
inputs:
173-
PathtoPublish: '$(Build.SourcesDirectory)\artifacts\SymStore\$(_BuildConfig)'
174-
ArtifactName: 'NativeSymbols'
175-
condition: succeeded()
176-
- task: ms-vseng.MicroBuildTasks.4305a8de-ba66-4d8b-b2d1-0dc4ecbbf5e8.MicroBuildUploadVstsDropFolder@1
177-
displayName: Upload VSTS Drop
178-
inputs:
179-
DropName: $(VisualStudioDropName)
180-
DropFolder: '$(Build.SourcesDirectory)\artifacts\VSSetup\$(_BuildConfig)\Insertion'
181-
AccessToken: $(dn-bot-devdiv-drop-rw-code-rw)
182-
condition: succeeded()
183-
18481
#-------------------------------------------------------------------------------------------------------------------#
18582
# PR builds without logs publishing #
18683
#-------------------------------------------------------------------------------------------------------------------#
@@ -272,7 +169,7 @@ stages:
272169
# because we want to catch cases when version is desynched and we didn't update it.
273170
# It is also helping the release notes automation to be up to date with packages versions.
274171
- job: Check_Published_Package_Versions
275-
# condition: or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), or(startsWith(variables['System.PullRequest.SourceBranch'], 'release/dev'), startsWith(variables['System.PullRequest.TargetBranch'], 'release/dev')))
172+
condition: or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), or(startsWith(variables['System.PullRequest.SourceBranch'], 'release/dev'), startsWith(variables['System.PullRequest.TargetBranch'], 'release/dev')))
276173
pool:
277174
vmImage: $(UbuntuMachineQueueName)
278175
strategy:
@@ -825,60 +722,4 @@ stages:
825722
targetPath: './artifacts/log/Release/AheadOfTime/Trimming/'
826723
artifactName: 'Trim Test Logs Attempt $(System.JobAttempt) Logs $(_kind)'
827724
continueOnError: true
828-
condition: always()
829-
830-
# Arcade-powered source build
831-
# turned off until https://github.com/dotnet/source-build/issues/1795 is fixed
832-
# - template: /eng/common/templates/jobs/jobs.yml
833-
# parameters:
834-
# enablePublishUsingPipelines: true
835-
# enablePublishBuildArtifacts: true
836-
# enablePublishBuildAssets: true
837-
# artifacts:
838-
# publish:
839-
# artifacts: true
840-
# manifests: true
841-
# runSourceBuild: true
842-
# sourceBuildParameters:
843-
# includeDefaultManagedPlatform: true
844-
845-
#---------------------------------------------------------------------------------------------------------------------#
846-
# Post Build #
847-
#---------------------------------------------------------------------------------------------------------------------#
848-
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
849-
- template: eng/common/templates/post-build/post-build.yml
850-
parameters:
851-
publishingInfraVersion: 3
852-
# Symbol validation is not entirely reliable as of yet, so should be turned off until https://github.com/dotnet/arcade/issues/2871 is resolved.
853-
enableSymbolValidation: false
854-
# SourceLink improperly looks for generated files. See https://github.com/dotnet/arcade/issues/3069
855-
enableSourceLinkValidation: false
856-
# Enable SDL validation, passing through values from the 'DotNet-FSharp-SDLValidation-Params' group.
857-
SDLValidationParameters:
858-
enable: true
859-
params: >-
860-
-SourceToolsList @("policheck","credscan")
861-
-ArtifactToolsList @("binskim")
862-
-BinskimAdditionalRunConfigParams @("IgnorePdbLoadError < True","Recurse < True")
863-
-TsaInstanceURL $(_TsaInstanceURL)
864-
-TsaProjectName $(_TsaProjectName)
865-
-TsaNotificationEmail $(_TsaNotificationEmail)
866-
-TsaCodebaseAdmin $(_TsaCodebaseAdmin)
867-
-TsaBugAreaPath $(_TsaBugAreaPath)
868-
-TsaIterationPath $(_TsaIterationPath)
869-
-TsaRepositoryName "FSharp"
870-
-TsaCodebaseName "FSharp-GitHub"
871-
-TsaPublish $True
872-
-PoliCheckAdditionalRunConfigParams @("UserExclusionPath < $(Build.SourcesDirectory)/eng/policheck_exclusions.xml")
873-
874-
#---------------------------------------------------------------------------------------------------------------------#
875-
# VS Insertion #
876-
#---------------------------------------------------------------------------------------------------------------------#
877-
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
878-
- template: eng/release/insert-into-vs.yml
879-
parameters:
880-
componentBranchName: refs/heads/release/dev17.9
881-
insertTargetBranch: rel/d17.9
882-
insertTeamEmail: [email protected]
883-
insertTeamName: 'F#'
884-
completeInsertion: 'auto'
725+
condition: always()

buildtools/checkpackages/FSharp.Compiler.Service_notshipped.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="$(MSBuildProjectDirectory)\..\..\eng\Versions.props" />
44

55
<PropertyGroup>
6-
<TargetFramework>$(FSharpNetCoreProductTargetFramework)</TargetFramework>
6+
<TargetFramework>net8.0</TargetFramework>
77
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
88
<CachePath>$(MSBuildProjectDirectory)\..\..\artifacts\tmp\$([System.Guid]::NewGuid())</CachePath>
99
<OutputPath>$(CachePath)\bin</OutputPath>

0 commit comments

Comments
 (0)