Skip to content

Commit c57ae10

Browse files
authored
Merge pull request #16013 from dotnet/merges/main-to-release/dev17.8
Merge main to release/dev17.8
2 parents 62aba1c + 1e24b21 commit c57ae10

File tree

3 files changed

+26
-3
lines changed

3 files changed

+26
-3
lines changed

azure-pipelines.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,29 @@ stages:
383383
ArtifactType: Container
384384
parallel: true
385385

386+
- job: WindowsNoStrictIndentation
387+
pool:
388+
name: $(DncEngPublicBuildPool)
389+
demands: ImageOverride -equals $(WindowsMachineQueueName)
390+
timeoutInMinutes: 120
391+
steps:
392+
- checkout: self
393+
clean: true
394+
395+
- script: eng\CIBuild.cmd -compressallmetadata -configuration Release /p:AdditionalFscCmdFlags=--strict-indentation-
396+
env:
397+
NativeToolsOnMachine: true
398+
displayName: Build
399+
400+
- task: PublishBuildArtifacts@1
401+
displayName: Publish Build BinLog
402+
condition: always()
403+
continueOnError: true
404+
inputs:
405+
PathToPublish: '$(Build.SourcesDirectory)\artifacts\log/Release\Build.VisualFSharp.sln.binlog'
406+
ArtifactName: 'Windows Release build binlogs'
407+
ArtifactType: Container
408+
parallel: true
386409

387410
# Windows With Compressed Metadata
388411
- job: WindowsCompressedMetadata

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.23465.1">
4+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.23468.3">
55
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
6-
<Sha>eeb7f1b24a845eebf3e0885a4650b8df67741d4a</Sha>
6+
<Sha>b88b567fbf54c5404d039b80cfb86f09a681f604</Sha>
77
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
88
</Dependency>
99
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.7.0-preview-23217-02">

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"Microsoft.VisualStudio.Component.FSharp"
1313
]
1414
},
15-
"xcopy-msbuild": "17.7.0-test"
15+
"xcopy-msbuild": "17.7.2"
1616
},
1717
"native-tools": {
1818
"perl": "5.38.0.1"

0 commit comments

Comments
 (0)