Skip to content

Commit a320c99

Browse files
Update dependencies from https://github.com/dotnet/dotnet build 283922
Updated Dependencies: dotnet-dev-certs, dotnet-user-jwts, dotnet-user-secrets, Microsoft.AspNetCore.Analyzers, Microsoft.AspNetCore.App.Ref, Microsoft.AspNetCore.App.Ref.Internal, Microsoft.AspNetCore.Authentication.Facebook, Microsoft.AspNetCore.Authentication.Google, Microsoft.AspNetCore.Authentication.MicrosoftAccount, Microsoft.AspNetCore.Authorization, Microsoft.AspNetCore.Components, Microsoft.AspNetCore.Components.Analyzers, Microsoft.AspNetCore.Components.Forms, Microsoft.AspNetCore.Components.SdkAnalyzers, Microsoft.AspNetCore.Components.Web, Microsoft.AspNetCore.Components.WebAssembly, Microsoft.AspNetCore.Components.WebAssembly.Server, Microsoft.AspNetCore.Components.WebView, Microsoft.AspNetCore.DeveloperCertificates.XPlat, Microsoft.AspNetCore.Metadata, Microsoft.AspNetCore.Mvc.Analyzers, Microsoft.AspNetCore.Mvc.Api.Analyzers, Microsoft.AspNetCore.TestHost, Microsoft.Bcl.AsyncInterfaces, Microsoft.DotNet.Web.ItemTemplates.10.0, Microsoft.DotNet.Web.ProjectTemplates.10.0, Microsoft.Extensions.Configuration.Ini, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.FileProviders.Abstractions, Microsoft.Extensions.FileProviders.Embedded, Microsoft.Extensions.FileSystemGlobbing, Microsoft.Extensions.Logging, Microsoft.Extensions.Logging.Abstractions, Microsoft.Extensions.Logging.Console, Microsoft.Extensions.ObjectPool, Microsoft.JSInterop, Microsoft.NET.HostModel, Microsoft.NET.ILLink.Tasks, Microsoft.NET.Runtime.Emscripten.3.1.56.Cache.win-x64, Microsoft.NET.Sdk.WindowsDesktop, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Win32.SystemEvents, Microsoft.WindowsDesktop.App.Internal, Microsoft.WindowsDesktop.App.Ref, System.CodeDom, System.ComponentModel.Composition, System.Composition.AttributedModel, System.Composition.Convention, System.Composition.Hosting, System.Composition.Runtime, System.Composition.TypedParts, System.Configuration.ConfigurationManager, System.Diagnostics.DiagnosticSource, System.Formats.Asn1, System.IO.Hashing, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Security.Cryptography.Pkcs, System.Security.Cryptography.ProtectedData, System.Security.Cryptography.Xml, System.Security.Permissions, System.ServiceProcess.ServiceController, System.Text.Encoding.CodePages, System.Text.Json, System.Windows.Extensions (Version 10.0.0-rc.1.25461.111 -> 10.0.0-rc.1.25468.107) Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal, Microsoft.CodeAnalysis.Razor.Tooling.Internal, Microsoft.NET.Sdk.Razor.SourceGenerators.Transport (Version 10.0.0-preview.25461.111 -> 10.0.0-preview.25468.107) Microsoft.Build, Microsoft.Build.Localization (Version 17.15.0-preview-25461-111 -> 18.0.0-preview-25468-107) Microsoft.Build.NuGetSdkResolver, NuGet.Build.Tasks, NuGet.Build.Tasks.Console, NuGet.Build.Tasks.Pack, NuGet.CommandLine.XPlat, NuGet.Commands, NuGet.Common, NuGet.Configuration, NuGet.Credentials, NuGet.DependencyResolver.Core, NuGet.Frameworks, NuGet.LibraryModel, NuGet.Localization, NuGet.Packaging, NuGet.ProjectModel, NuGet.Protocol, NuGet.Versioning (Version 7.0.0-preview.1.46211 -> 7.0.0-preview.1.46907) Microsoft.Build.Tasks.Git, Microsoft.SourceLink.AzureRepos.Git, Microsoft.SourceLink.Bitbucket.Git, Microsoft.SourceLink.Common, Microsoft.SourceLink.GitHub, Microsoft.SourceLink.GitLab (Version 10.0.0-beta.25461.111 -> 10.0.0-beta.25468.107) Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.BuildClient, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.CSharp.CodeStyle, Microsoft.CodeAnalysis.CSharp.Features, Microsoft.CodeAnalysis.CSharp.Workspaces, Microsoft.CodeAnalysis.PublicApiAnalyzers, Microsoft.CodeAnalysis.Workspaces.Common, Microsoft.CodeAnalysis.Workspaces.MSBuild, Microsoft.Net.Compilers.Toolset, Microsoft.Net.Compilers.Toolset.Framework (Version 5.0.0-2.25461.111 -> 5.0.0-2.25468.107) Microsoft.Deployment.DotNet.Releases (Version 2.0.0-preview.1.25461.111 -> 2.0.0-preview.1.25468.107) Microsoft.DiaSymReader (Version 2.2.0-beta.25461.111 -> 2.2.0-beta.25468.107) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.SignTool, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.XUnitExtensions (Version 11.0.0-beta.25461.111 -> 11.0.0-beta.25468.107) Microsoft.FSharp.Compiler (Version 14.0.100-rc2.25461.111 -> 14.0.100-rc2.25468.107) Microsoft.NET.Test.Sdk, Microsoft.TestPlatform.Build, Microsoft.TestPlatform.CLI (Version 18.0.0-preview-25461-111 -> 18.0.0-preview-25468-107) Microsoft.TemplateEngine.Abstractions, Microsoft.TemplateEngine.Authoring.TemplateVerifier, Microsoft.TemplateEngine.Edge, Microsoft.TemplateEngine.Mocks, Microsoft.TemplateEngine.Orchestrator.RunnableProjects, Microsoft.TemplateEngine.TestHelper, Microsoft.TemplateEngine.Utils, Microsoft.TemplateSearch.Common, Microsoft.TemplateSearch.TemplateDiscovery (Version 10.0.100-rc.1.25461.111 -> 11.0.100-alpha.1.25468.107) Microsoft.Web.Xdt (Version 3.2.0-preview.25461.111 -> 3.2.0-preview.25468.107) System.CommandLine (Version 2.0.0-rc.1.25461.111 -> 2.0.0-rc.1.25468.107) Microsoft.Testing.Platform (Version 1.9.0-preview.25467.1 -> 1.9.0-preview.25466.1) MSTest (Version 3.11.0-preview.25467.1 -> 3.11.0-preview.25466.1)
1 parent 22b0288 commit a320c99

File tree

9 files changed

+402
-415
lines changed

9 files changed

+402
-415
lines changed

eng/Version.Details.props

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

eng/Version.Details.xml

Lines changed: 265 additions & 265 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ jobs:
131131
/p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
132132
/p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
133133
/p:MaestroApiEndpoint=https://maestro.dot.net
134-
/p:OfficialBuildId=$(Build.BuildNumber)
134+
/p:OfficialBuildId=$(OfficialBuildId)
135135
condition: ${{ parameters.condition }}
136136
continueOnError: ${{ parameters.continueOnError }}
137137

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/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 }}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ parameters:
1111
# for details. The entire object is described in the 'job' template for simplicity, even though
1212
# the usage of the properties on this object is split between the 'job' and 'steps' templates.
1313
platform: {}
14-
15-
# Optional list of directories to ignore for component governance scans.
16-
componentGovernanceIgnoreDirectories: []
17-
1814
is1ESPipeline: false
1915

2016
steps:

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
}
2222
},
2323
"msbuild-sdks": {
24-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25461.111",
25-
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25461.111",
24+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25468.107",
25+
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25468.107",
2626
"Microsoft.Build.NoTargets": "3.7.0",
2727
"Microsoft.Build.Traversal": "3.4.0",
2828
"Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382"

0 commit comments

Comments
 (0)