Skip to content

Commit 15c8706

Browse files
sbomersbomer
committed
Merge remote-tracking branch 'origin/feature/10.0' into validationWip
2 parents cb5ccf7 + f3fb4bf commit 15c8706

File tree

15 files changed

+85
-129
lines changed

15 files changed

+85
-129
lines changed

‎eng/Version.Details.xml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,66 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="10.0.0-preview.4.25210.6" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0">
3+
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="10.0.0-preview.4.25218.4" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0">
44
<Uri>https://github.com/dotnet/aspnetcore</Uri>
5-
<Sha>c31f60c086518f4682bf94feee8b483c501b9188</Sha>
5+
<Sha>efe40be07df5055d0d52810899349612e88c89a3</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.Diagnostics.Monitoring" Version="9.0.0-preview.25155.1">
7+
<Dependency Name="Microsoft.Diagnostics.Monitoring" Version="9.0.0-preview.25220.1">
88
<Uri>https://github.com/dotnet/diagnostics</Uri>
9-
<Sha>b1037b7cc1ef0b00a9032f19a83b074a00c9a4b8</Sha>
9+
<Sha>22431fb5bfe047454e652a7274f4b4bc4b367527</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.Diagnostics.Monitoring.EventPipe" Version="9.0.0-preview.25155.1">
11+
<Dependency Name="Microsoft.Diagnostics.Monitoring.EventPipe" Version="9.0.0-preview.25220.1">
1212
<Uri>https://github.com/dotnet/diagnostics</Uri>
13-
<Sha>b1037b7cc1ef0b00a9032f19a83b074a00c9a4b8</Sha>
13+
<Sha>22431fb5bfe047454e652a7274f4b4bc4b367527</Sha>
1414
</Dependency>
15-
<Dependency Name="System.CommandLine" Version="2.0.0-beta5.25170.1">
15+
<Dependency Name="System.CommandLine" Version="2.0.0-beta5.25218.1">
1616
<Uri>https://github.com/dotnet/command-line-api</Uri>
17-
<Sha>931bc0d178882c11daf9e38ae88858691e2df2b9</Sha>
17+
<Sha>51366ef782ef34c51db469cead5c01f551249f86</Sha>
1818
</Dependency>
1919
</ProductDependencies>
2020
<ToolsetDependencies>
2121
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.25076.3">
2222
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
2323
<Sha>16865ea61910500f1022ad2b96c499e5df02c228</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25214.8">
25+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25217.1">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
27+
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25214.8">
29+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25217.1">
3030
<Uri>https://github.com/dotnet/arcade</Uri>
31-
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
31+
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25214.8">
33+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25217.1">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
35+
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25214.8">
37+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25217.1">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
39+
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25214.8">
41+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25217.1">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
43+
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.FileFormats" Version="1.0.615501">
45+
<Dependency Name="Microsoft.FileFormats" Version="1.0.622001">
4646
<Uri>https://github.com/dotnet/diagnostics</Uri>
47-
<Sha>b1037b7cc1ef0b00a9032f19a83b074a00c9a4b8</Sha>
47+
<Sha>22431fb5bfe047454e652a7274f4b4bc4b367527</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.4.25210.5" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0">
49+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.4.25217.10" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0">
5050
<Uri>https://github.com/dotnet/runtime</Uri>
51-
<Sha>7618121e0f64098e2b81ed7c8cdf7024a1b87795</Sha>
51+
<Sha>e1702c393a1ef71b211f51d00beedec0151c9f25</Sha>
5252
</Dependency>
53-
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.4.25210.6" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0">
53+
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.4.25218.4" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0">
5454
<Uri>https://github.com/dotnet/aspnetcore</Uri>
55-
<Sha>c31f60c086518f4682bf94feee8b483c501b9188</Sha>
55+
<Sha>efe40be07df5055d0d52810899349612e88c89a3</Sha>
5656
</Dependency>
57-
<Dependency Name="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0" Version="10.0.100-preview.4.25211.22">
57+
<Dependency Name="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0" Version="10.0.100-preview.4.25220.1">
5858
<Uri>https://github.com/dotnet/sdk</Uri>
59-
<Sha>a081488f32ee97b730ac15197a1b0044a89a3995</Sha>
59+
<Sha>f4de547215d995985f21f195b29909d8569bcf46</Sha>
6060
</Dependency>
61-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.4.25210.5" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0">
61+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.4.25217.10" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0">
6262
<Uri>https://github.com/dotnet/runtime</Uri>
63-
<Sha>7618121e0f64098e2b81ed7c8cdf7024a1b87795</Sha>
63+
<Sha>e1702c393a1ef71b211f51d00beedec0151c9f25</Sha>
6464
</Dependency>
6565
</ToolsetDependencies>
6666
</Dependencies>

‎eng/Versions.props

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,26 +48,26 @@
4848
-->
4949
<PropertyGroup Label="Automated">
5050
<!-- dotnet/arcade references -->
51-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25214.8</MicrosoftDotNetBuildTasksArchivesVersion>
52-
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25214.8</MicrosoftDotNetCodeAnalysisVersion>
53-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25214.8</MicrosoftDotNetXUnitExtensionsVersion>
51+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25217.1</MicrosoftDotNetBuildTasksArchivesVersion>
52+
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25217.1</MicrosoftDotNetCodeAnalysisVersion>
53+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25217.1</MicrosoftDotNetXUnitExtensionsVersion>
5454
<!-- dotnet/aspnetcore references -->
55-
<MicrosoftAspNetCoreAppRuntimewinx64Version>10.0.0-preview.4.25210.6</MicrosoftAspNetCoreAppRuntimewinx64Version>
56-
<VSRedistCommonAspNetCoreSharedFrameworkx64100Version>10.0.0-preview.4.25210.6</VSRedistCommonAspNetCoreSharedFrameworkx64100Version>
55+
<MicrosoftAspNetCoreAppRuntimewinx64Version>10.0.0-preview.4.25218.4</MicrosoftAspNetCoreAppRuntimewinx64Version>
56+
<VSRedistCommonAspNetCoreSharedFrameworkx64100Version>10.0.0-preview.4.25218.4</VSRedistCommonAspNetCoreSharedFrameworkx64100Version>
5757
<!-- dotnet/command-line-api references -->
58-
<SystemCommandLineVersion>2.0.0-beta5.25170.1</SystemCommandLineVersion>
58+
<SystemCommandLineVersion>2.0.0-beta5.25218.1</SystemCommandLineVersion>
5959
<!-- dotnet/diagnostics references -->
60-
<MicrosoftDiagnosticsMonitoringVersion>9.0.0-preview.25155.1</MicrosoftDiagnosticsMonitoringVersion>
61-
<MicrosoftDiagnosticsMonitoringEventPipeVersion>9.0.0-preview.25155.1</MicrosoftDiagnosticsMonitoringEventPipeVersion>
60+
<MicrosoftDiagnosticsMonitoringVersion>9.0.0-preview.25220.1</MicrosoftDiagnosticsMonitoringVersion>
61+
<MicrosoftDiagnosticsMonitoringEventPipeVersion>9.0.0-preview.25220.1</MicrosoftDiagnosticsMonitoringEventPipeVersion>
6262
<!-- dotnet/roslyn-analyzers -->
6363
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.25076.4</MicrosoftCodeAnalysisNetAnalyzersVersion>
6464
<!-- dotnet/runtime references -->
65-
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.4.25210.5</MicrosoftNETCoreAppRuntimewinx64Version>
66-
<VSRedistCommonNetCoreSharedFrameworkx64100Version>10.0.0-preview.4.25210.5</VSRedistCommonNetCoreSharedFrameworkx64100Version>
65+
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.4.25217.10</MicrosoftNETCoreAppRuntimewinx64Version>
66+
<VSRedistCommonNetCoreSharedFrameworkx64100Version>10.0.0-preview.4.25217.10</VSRedistCommonNetCoreSharedFrameworkx64100Version>
6767
<!-- dotnet/sdk references -->
68-
<VSRedistCommonNetCoreSdkPlaceholderx64100Version>10.0.100-preview.4.25211.22</VSRedistCommonNetCoreSdkPlaceholderx64100Version>
68+
<VSRedistCommonNetCoreSdkPlaceholderx64100Version>10.0.100-preview.4.25220.1</VSRedistCommonNetCoreSdkPlaceholderx64100Version>
6969
<!-- dotnet/symstore references -->
70-
<MicrosoftFileFormatsVersion>1.0.615501</MicrosoftFileFormatsVersion>
70+
<MicrosoftFileFormatsVersion>1.0.622001</MicrosoftFileFormatsVersion>
7171
</PropertyGroup>
7272
<PropertyGroup Label="Runtime Versions">
7373
<MicrosoftAspNetCoreApp80Version>$(MicrosoftNETCoreApp80Version)</MicrosoftAspNetCoreApp80Version>

‎eng/common/core-templates/jobs/jobs.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ parameters:
2727
# Optional: Publish the assets as soon as the publish to BAR stage is complete, rather doing so in a separate stage.
2828
publishAssetsImmediately: false
2929

30+
# Optional: 🌤️ or not the build has assets it wants to publish to BAR
31+
isAssetlessBuild: false
32+
3033
# Optional: If using publishAssetsImmediately and additional parameters are needed, can be used to send along additional parameters (normally sent to post-build.yml)
3134
artifactsPublishingAdditionalParameters: ''
3235
signingValidationAdditionalParameters: ''
@@ -110,6 +113,7 @@ jobs:
110113

111114
runAsPublic: ${{ parameters.runAsPublic }}
112115
publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }}
116+
isAssetlessBuild: ${{ parameters.isAssetlessBuild }}
113117
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
114118
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
115119
signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }}

‎eng/common/core-templates/steps/install-microbuild.yml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,6 @@ parameters:
1111
steps:
1212
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
1313
- ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
14-
# Install Python 3.12.x on when Python > 3.12.x is installed - https://github.com/dotnet/source-build/issues/4802
15-
- script: |
16-
version=$(python3 --version | awk '{print $2}')
17-
major=$(echo $version | cut -d. -f1)
18-
minor=$(echo $version | cut -d. -f2)
19-
20-
installPython=false
21-
if [ "$major" -gt 3 ] || { [ "$major" -eq 3 ] && [ "$minor" -gt 12 ]; }; then
22-
installPython=true
23-
fi
24-
25-
echo "Python version: $version."
26-
echo "Install Python 3.12.x: $installPython."
27-
echo "##vso[task.setvariable variable=installPython;isOutput=true]$installPython"
28-
name: InstallPython
29-
displayName: 'Determine Python installation'
30-
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
31-
32-
- task: UsePythonVersion@0
33-
inputs:
34-
versionSpec: '3.12.x'
35-
displayName: 'Use Python 3.12.x'
36-
condition: and(succeeded(), eq(variables['InstallPython.installPython'], 'true'), ne(variables['Agent.Os'], 'Windows_NT'))
37-
3814
# Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable
3915
- task: UseDotNet@2
4016
displayName: Install .NET 8.0 SDK for MicroBuild Plugin

‎eng/common/sdk-task.ps1

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ Param(
66
[string] $msbuildEngine = $null,
77
[switch] $restore,
88
[switch] $prepareMachine,
9+
[switch][Alias('nobl')]$excludeCIBinaryLog,
910
[switch] $help,
1011
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
1112
)
1213

1314
$ci = $true
14-
$binaryLog = $true
15+
$binaryLog = if ($excludeCIBinaryLog) { $false } else { $true }
1516
$warnAsError = $true
1617

1718
. $PSScriptRoot\tools.ps1
@@ -27,17 +28,19 @@ function Print-Usage() {
2728
Write-Host "Advanced settings:"
2829
Write-Host " -prepareMachine Prepare machine for CI run"
2930
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
31+
Write-Host " -excludeCIBinaryLog When running on CI, allow no binary log (short: -nobl)"
3032
Write-Host ""
3133
Write-Host "Command line arguments not listed above are passed thru to msbuild."
3234
}
3335

3436
function Build([string]$target) {
3537
$logSuffix = if ($target -eq 'Execute') { '' } else { ".$target" }
3638
$log = Join-Path $LogDir "$task$logSuffix.binlog"
39+
$binaryLogArg = if ($binaryLog) { "/bl:$log" } else { "" }
3740
$outputPath = Join-Path $ToolsetDir "$task\"
3841

3942
MSBuild $taskProject `
40-
/bl:$log `
43+
$binaryLogArg `
4144
/t:$target `
4245
/p:Configuration=$configuration `
4346
/p:RepoRoot=$RepoRoot `

‎eng/common/sdk-task.sh

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ show_usage() {
77
echo " --verbosity <value> Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]"
88
echo " --help Print help and exit"
99
echo ""
10+
11+
echo "Advanced settings:"
12+
echo " --excludeCIBinarylog Don't output binary log (short: -nobl)"
13+
echo ""
1014
echo "Command line arguments not listed above are passed thru to msbuild."
1115
}
1216

@@ -27,10 +31,12 @@ Build() {
2731
local log_suffix=""
2832
[[ "$target" != "Execute" ]] && log_suffix=".$target"
2933
local log="$log_dir/$task$log_suffix.binlog"
34+
local binaryLogArg=""
35+
[[ $binary_log == true ]] && binaryLogArg="/bl:$log"
3036
local output_path="$toolset_dir/$task/"
3137

3238
MSBuild "$taskProject" \
33-
/bl:"$log" \
39+
$binaryLogArg \
3440
/t:"$target" \
3541
/p:Configuration="$configuration" \
3642
/p:RepoRoot="$repo_root" \
@@ -39,8 +45,10 @@ Build() {
3945
$properties
4046
}
4147

48+
binary_log=true
4249
configuration="Debug"
4350
verbosity="minimal"
51+
exclude_ci_binary_log=false
4452
restore=false
4553
help=false
4654
properties=''
@@ -60,6 +68,11 @@ while (($# > 0)); do
6068
verbosity=$2
6169
shift 2
6270
;;
71+
--excludecibinarylog|--nobl)
72+
binary_log=false
73+
exclude_ci_binary_log=true
74+
shift 1
75+
;;
6376
--help)
6477
help=true
6578
shift 1
@@ -72,7 +85,6 @@ while (($# > 0)); do
7285
done
7386

7487
ci=true
75-
binaryLog=true
7688
warnAsError=true
7789

7890
if $help; then

‎eng/dependabot/independent/Packages.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<!-- Third-party references -->
1717
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
1818
<PackageReference Include="NJsonSchema" Version="$(NJsonSchemaVersion)" />
19-
<PackageReference Include="Swashbuckle.AspNetCore" Version="$(SwashbuckleAspNetCoreVersion)" />
2019
<PackageReference Include="Moq" Version="$(MoqVersion)" />
2120
<PackageReference Include="AWSSDK.S3" Version="$(AwsSdkS3Version)" />
2221
<PackageReference Include="AWSSDK.SecurityToken" Version="$(AwsSdkSecurityTokenVersion)" />

‎eng/dependabot/independent/Versions.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<!-- Third-party references -->
1515
<NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
1616
<NJsonSchemaVersion>11.0.0</NJsonSchemaVersion>
17-
<SwashbuckleAspNetCoreVersion>7.2.0</SwashbuckleAspNetCoreVersion>
1817
<AwsSdkS3Version>3.7.305.7</AwsSdkS3Version>
1918
<AwsSdkSecurityTokenVersion>3.7.300.33</AwsSdkSecurityTokenVersion>
2019

‎eng/dependabot/nuget.org/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<!-- Import references updated by Dependabot. -->
33
<PropertyGroup>
44
<!-- dotnet/diagnostics references -->
5-
<MicrosoftDiagnosticsMonitoringShippedVersion>9.0.607501</MicrosoftDiagnosticsMonitoringShippedVersion>
5+
<MicrosoftDiagnosticsMonitoringShippedVersion>9.0.621003</MicrosoftDiagnosticsMonitoringShippedVersion>
66
</PropertyGroup>
77
</Project>

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
},
2727
"msbuild-sdks": {
2828
"Microsoft.Build.NoTargets": "3.7.0",
29-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25214.8",
30-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25214.8"
29+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25217.1",
30+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25217.1"
3131
}
3232
}

0 commit comments

Comments
 (0)