Skip to content

Commit a10e95a

Browse files
[release/10.0] Source code updates from dotnet/dotnet (#63806)
* Backflow from https://github.com/dotnet/dotnet / 537ecf8 build 284571 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 284571 Updated Dependencies: Microsoft.NET.Runtime.WebAssembly.Sdk, Microsoft.NETCore.BrowserDebugHost.Transport, Microsoft.NET.Runtime.MonoAOTCompiler.Task, dotnet-ef, Microsoft.Bcl.AsyncInterfaces, Microsoft.Bcl.TimeProvider, Microsoft.EntityFrameworkCore, Microsoft.EntityFrameworkCore.Design, Microsoft.EntityFrameworkCore.InMemory, Microsoft.EntityFrameworkCore.Relational, Microsoft.EntityFrameworkCore.Sqlite, Microsoft.EntityFrameworkCore.SqlServer, Microsoft.EntityFrameworkCore.Tools, Microsoft.Extensions.Caching.Abstractions, Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration, Microsoft.Extensions.Configuration.Abstractions, Microsoft.Extensions.Configuration.Binder, Microsoft.Extensions.Configuration.CommandLine, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.FileExtensions, Microsoft.Extensions.Configuration.Ini, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.Configuration.UserSecrets, Microsoft.Extensions.Configuration.Xml, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyInjection.Abstractions, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.Diagnostics, Microsoft.Extensions.Diagnostics.Abstractions, Microsoft.Extensions.FileProviders.Abstractions, Microsoft.Extensions.FileProviders.Composite, Microsoft.Extensions.FileProviders.Physical, Microsoft.Extensions.FileSystemGlobbing, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Hosting, Microsoft.Extensions.Hosting.Abstractions, Microsoft.Extensions.Http, Microsoft.Extensions.Logging, Microsoft.Extensions.Logging.Abstractions, Microsoft.Extensions.Logging.Configuration, Microsoft.Extensions.Logging.Console, Microsoft.Extensions.Logging.Debug, Microsoft.Extensions.Logging.EventLog, Microsoft.Extensions.Logging.EventSource, Microsoft.Extensions.Logging.TraceSource, Microsoft.Extensions.Options, Microsoft.Extensions.Options.ConfigurationExtensions, Microsoft.Extensions.Options.DataAnnotations, Microsoft.Extensions.Primitives, Microsoft.Internal.Runtime.AspNetCore.Transport, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, System.Collections.Immutable, System.Composition, System.Configuration.ConfigurationManager, System.Diagnostics.DiagnosticSource, System.Diagnostics.EventLog, System.Diagnostics.PerformanceCounter, System.DirectoryServices.Protocols, System.Formats.Asn1, System.Formats.Cbor, System.IO.Hashing, System.IO.Pipelines, System.Memory.Data, System.Net.Http.Json, System.Net.Http.WinHttpHandler, System.Net.ServerSentEvents, System.Numerics.Tensors, System.Reflection.Metadata, System.Resources.Extensions, System.Runtime.Caching, System.Security.Cryptography.Pkcs, System.Security.Cryptography.Xml, System.Security.Permissions, System.ServiceProcess.ServiceController, System.Text.Encodings.Web, System.Text.Json, System.Threading.AccessControl, System.Threading.Channels, System.Threading.RateLimiting (Version 10.0.0-rc.2.25468.104 -> 10.0.0-rc.2.25473.111) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.SharedFramework.Sdk (Version 10.0.0-beta.25468.104 -> 10.0.0-beta.25473.111) Microsoft.Web.Xdt (Version 3.2.0-preview.25468.104 -> 3.2.0-preview.25473.111) NuGet.Frameworks, NuGet.Packaging, NuGet.Versioning (Version 7.0.0-preview.2.46904 -> 7.0.0-preview.2.47411) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 8d29610 commit a10e95a

File tree

6 files changed

+285
-286
lines changed

6 files changed

+285
-286
lines changed

eng/Version.Details.props

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

eng/Version.Details.xml

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

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
"jdk": "latest"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25468.104",
31-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25468.104",
32-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25468.104",
30+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25473.111",
31+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25473.111",
32+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25473.111",
3333
"Microsoft.Build.NoTargets": "3.7.0",
3434
"Microsoft.Build.Traversal": "3.4.0",
3535
"Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382"

src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
<Project>
33
<Import Project="Sdk.props" Sdk="Microsoft.WixToolset.Sdk" />
44
<PropertyGroup>
5-
<Name>AspNetCoreModuleV2IISExpress</Name>
65
<IsShipping>true</IsShipping>
76
<ProjectGuid>17c76489-4c09-4e14-b81c-7a86cd937144</ProjectGuid>
87
<OutputType>Package</OutputType>
9-
<OutputName>$(Name)_$(Platform)</OutputName>
8+
<OutputName>ancm_iis_express_$(Platform)_en_v2_$(_ProductVersionForInstallers)</OutputName>
109
<SuppressIces>ICE03</SuppressIces>
1110
<DisableGuidGeneration>true</DisableGuidGeneration>
1211
<SchemaVersion>2.0</SchemaVersion>
@@ -64,7 +63,7 @@
6463
<Import Project="..\build\settings.props" />
6564

6665
<PropertyGroup>
67-
<PackageFileName>ancm_iis_express_$(Platform)_en_v2_$(PackageVersion)$(TargetExt)</PackageFileName>
66+
<PackageFileName>$(OutputName)$(TargetExt)</PackageFileName>
6867
<ProductNameShort>ASP.NET Core Module IIS Express V2</ProductNameShort>
6968
</PropertyGroup>
7069

src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
<Project>
33
<Import Project="Sdk.props" Sdk="Microsoft.WixToolset.Sdk" />
44
<PropertyGroup>
5-
<Name>AspNetCoreModuleV2</Name>
65
<IsShipping>true</IsShipping>
76
<ProjectGuid>f9bacb48-3bd7-4ec2-ae31-664e8703ec12</ProjectGuid>
87
<OutputType>Package</OutputType>
9-
<OutputName>$(Name)_$(Platform)</OutputName>
8+
<OutputName>aspnetcoremodule_$(Platform)_en_v2_$(_ProductVersionForInstallers)</OutputName>
109
<GenerateRandomNamespaceGuid>true</GenerateRandomNamespaceGuid>
1110
<SchemaVersion>2.0</SchemaVersion>
1211
<DisableGuidGeneration>true</DisableGuidGeneration>
@@ -49,7 +48,7 @@
4948
<Import Project="..\build\settings.props" />
5049

5150
<PropertyGroup>
52-
<PackageFileName>aspnetcoremodule_$(Platform)_en_v2_$(PackageVersion)$(TargetExt)</PackageFileName>
51+
<PackageFileName>$(OutputName)$(TargetExt)</PackageFileName>
5352
<ProductNameShort>ASP.NET Core Module V2</ProductNameShort>
5453
</PropertyGroup>
5554

src/Installers/Windows/Wix.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@
129129
PdbFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetPdbFileName)"
130130
PdbType="$(DebugType)"
131131
SourceFiles="@(Compile)"
132+
SuppressSpecificWarnings="$(SuppressSpecificWarnings)"
132133
LocalizationFiles="@(_WixLocalizationFile)"
133134
BindPaths="@(BindPath)"
134135
WixpackWorkingDir="$(WixpackWorkingDir)">

0 commit comments

Comments
 (0)