Skip to content

Commit 807be93

Browse files
[release/10.0.1xx] Source code updates from dotnet/dotnet (#50901)
[release/10.0.1xx] Source code updates from dotnet/dotnet - Fix roslyn build task tests - Update DotnetCliSnapshotTests.VerifyCompletions with new nuget option NuGet/NuGet.Client@d8af2ab - Merge branch 'release/10.0.1xx' of https://github.com/dotnet/sdk into darc-release/10.0.1xx-8fed8cd2-2bd2-4032-9aac-331d69074d47 - Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-8fed8cd2-2bd2-4032-9aac-331d69074d47 - Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-8fed8cd2-2bd2-4032-9aac-331d69074d47 - Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-8fed8cd2-2bd2-4032-9aac-331d69074d47 - Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-8fed8cd2-2bd2-4032-9aac-331d69074d47 - Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-8fed8cd2-2bd2-4032-9aac-331d69074d47 - Resolve NU1109 by upgrading centrally defined MessagePack version to 3.1.4 - Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-8fed8cd2-2bd2-4032-9aac-331d69074d47 - Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-8fed8cd2-2bd2-4032-9aac-331d69074d47 - Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-8fed8cd2-2bd2-4032-9aac-331d69074d47
1 parent 2ab81d4 commit 807be93

25 files changed

+466
-457
lines changed

Directory.Packages.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<NoWarn>$(NoWarn);NU1507</NoWarn>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageVersion Include="Basic.CompilerLog.Util" Version="0.9.9" />
8+
<PackageVersion Include="Basic.CompilerLog.Util" Version="0.9.18" />
99
<PackageVersion Include="AwesomeAssertions" Version="$(AwesomeAssertionsVersion)" />
1010
<PackageVersion Include="BenchmarkDotNet" Version="$(BenchmarkDotNetPackageVersion)" />
1111
<PackageVersion Include="AwesomeAssertions.Json" Version="$(AwesomeAssertionsJsonVersion)" />
12-
<PackageVersion Include="MessagePack" Version="2.5.187" />
12+
<PackageVersion Include="MessagePack" Version="3.1.4" />
1313
<PackageVersion Include="MicroBuild.Plugins.SwixBuild.Dotnet" Version="1.1.87-gba258badda" />
1414
<PackageVersion Include="Microsoft.ApplicationInsights" Version="$(MicrosoftApplicationInsightsPackageVersion)" />
1515
<PackageVersion Include="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="$(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion)" />
@@ -94,7 +94,7 @@
9494
<PackageVersion Include="Microsoft.WixToolset.Heat" Version="$(MicrosoftWixToolsetSdkVersion)" />
9595
<PackageVersion Include="Microsoft.WixToolset.Util.wixext" Version="$(MicrosoftWixToolsetSdkVersion)" />
9696
<PackageVersion Include="Microsoft.WixToolset.UI.wixext" Version="$(MicrosoftWixToolsetSdkVersion)" />
97-
<PackageVersion Include="MSBuild.StructuredLogger" Version="2.2.386" />
97+
<PackageVersion Include="MSBuild.StructuredLogger" Version="2.3.45" />
9898
<PackageVersion Include="Moq" Version="$(MoqPackageVersion)" />
9999
<PackageVersion Include="NETStandard.Library.NETFramework" Version="$(NETStandardLibraryNETFrameworkVersion)" />
100100
<PackageVersion Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />

eng/Signing.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@
8484

8585
<ItemGroup>
8686
<FileSignInfo Include="StreamJsonRpc.dll" CertificateName="MicrosoftSHA2" />
87+
88+
<!-- Roslyn apphosts -->
89+
<FileSignInfo Condition="'$(TargetOS)' == 'osx'" Include="csc;vbc;VBCSCompiler" CertificateName="MacDeveloperHarden" />
8790
</ItemGroup>
8891

8992
<!-- Filter out any test packages from ItemsToSign -->

eng/Version.Details.props

Lines changed: 130 additions & 130 deletions
Large diffs are not rendered by default.

eng/Version.Details.xml

Lines changed: 261 additions & 261 deletions
Large diffs are not rendered by default.

eng/common/SetupNugetSources.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ if ($dotnet31Source -ne $null) {
157157
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
158158
}
159159

160-
$dotnetVersions = @('5','6','7','8','9')
160+
$dotnetVersions = @('5','6','7','8','9','10')
161161

162162
foreach ($dotnetVersion in $dotnetVersions) {
163163
$feedPrefix = "dotnet" + $dotnetVersion;

eng/common/SetupNugetSources.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ if [ "$?" == "0" ]; then
9999
PackageSources+=('dotnet3.1-internal-transport')
100100
fi
101101

102-
DotNetVersions=('5' '6' '7' '8' '9')
102+
DotNetVersions=('5' '6' '7' '8' '9' '10')
103103

104104
for DotNetVersion in ${DotNetVersions[@]} ; do
105105
FeedPrefix="dotnet${DotNetVersion}";

eng/common/core-templates/job/publish-build-assets.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ parameters:
4040

4141
repositoryAlias: self
4242

43-
officialBuildId: ''
44-
4543
jobs:
4644
- job: Asset_Registry_Publish
4745

@@ -64,11 +62,6 @@ jobs:
6462
value: false
6563
# unconditional - needed for logs publishing (redactor tool version)
6664
- template: /eng/common/core-templates/post-build/common-variables.yml
67-
- name: OfficialBuildId
68-
${{ if ne(parameters.officialBuildId, '') }}:
69-
value: ${{ parameters.officialBuildId }}
70-
${{ else }}:
71-
value: $(Build.BuildNumber)
7265

7366
pool:
7467
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)

eng/common/core-templates/job/source-build.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ parameters:
3434
# container and pool.
3535
platform: {}
3636

37-
# Optional list of directories to ignore for component governance scans.
38-
componentGovernanceIgnoreDirectories: []
39-
4037
is1ESPipeline: ''
4138

4239
# If set to true and running on a non-public project,
@@ -97,4 +94,3 @@ jobs:
9794
parameters:
9895
is1ESPipeline: ${{ parameters.is1ESPipeline }}
9996
platform: ${{ parameters.platform }}
100-
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ parameters:
4444
artifacts: {}
4545
is1ESPipeline: ''
4646
repositoryAlias: self
47-
officialBuildId: ''
4847

4948
# Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
5049
# and some (Microbuild) should only be applied to non-PR cases for internal builds.
@@ -117,4 +116,3 @@ jobs:
117116
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
118117
signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }}
119118
repositoryAlias: ${{ parameters.repositoryAlias }}
120-
officialBuildId: ${{ parameters.officialBuildId }}

eng/common/core-templates/jobs/source-build.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ parameters:
1515
# one job runs on 'defaultManagedPlatform'.
1616
platforms: []
1717

18-
# Optional list of directories to ignore for component governance scans.
19-
componentGovernanceIgnoreDirectories: []
20-
2118
is1ESPipeline: ''
2219

2320
# If set to true and running on a non-public project,
@@ -34,7 +31,6 @@ jobs:
3431
is1ESPipeline: ${{ parameters.is1ESPipeline }}
3532
jobNamePrefix: ${{ parameters.jobNamePrefix }}
3633
platform: ${{ platform }}
37-
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
3834
enableInternalSources: ${{ parameters.enableInternalSources }}
3935

4036
- ${{ if eq(length(parameters.platforms), 0) }}:
@@ -43,5 +39,4 @@ jobs:
4339
is1ESPipeline: ${{ parameters.is1ESPipeline }}
4440
jobNamePrefix: ${{ parameters.jobNamePrefix }}
4541
platform: ${{ parameters.defaultManagedPlatform }}
46-
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
4742
enableInternalSources: ${{ parameters.enableInternalSources }}

0 commit comments

Comments
 (0)