Skip to content

Commit 3816f31

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/dotnet (#62664)
[main] Source code updates from dotnet/dotnet - Merge branch 'main' into darc-main-f6a8d6f9-f17e-4a00-b652-27f886c87b1f - Revert version changes to hybridcache and msbuild packages - Bump XUnitRunnerVisualStudioVersion to 3.1.3 - Revert msbuild again and move properties to the correct sections in Versions.props/V.D.xml - Skip manually updated versions in CodeCheck.ps1
1 parent 5f21e7c commit 3816f31

File tree

7 files changed

+348
-320
lines changed

7 files changed

+348
-320
lines changed

‎eng/Version.Details.xml‎

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

‎eng/Versions.props‎

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

‎eng/scripts/CodeCheck.ps1‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,11 @@ try {
124124
foreach ($dep in $versionDetails.SelectNodes('//Dependency')) {
125125
Write-Verbose "Found $dep"
126126

127+
if ($dep.Label -eq 'Manual') {
128+
# skip dependencies that are manually updated
129+
continue
130+
}
131+
127132
$expectedVersion = $dep.Version
128133

129134
if ($dep.Name -in $globalJson.'msbuild-sdks'.PSObject.Properties.Name) {

‎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.25358.102",
31-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25358.102",
32-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25358.102",
30+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25366.103",
31+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25366.103",
32+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25366.103",
3333
"Microsoft.Build.NoTargets": "3.7.0",
3434
"Microsoft.Build.Traversal": "3.4.0"
3535
}

‎src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<GenerateInstallers Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</GenerateInstallers>
3939
<BuildDebPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64'">true</BuildDebPackage>
4040
<BuildRpmPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64'">true</BuildRpmPackage>
41+
<UseArcadeRpmTooling>true</UseArcadeRpmTooling>
4142
<GenerateVSInsertionPackages>true</GenerateVSInsertionPackages>
4243
</PropertyGroup>
4344

‎src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@
101101

102102
<NativeRuntimeAsset Condition=" '$(UseIisNativeAssets)' == 'true' AND !$(BuildNative) "
103103
Include="$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.dll" />
104-
<NativeRuntimeAsset Condition=" '$(UseIisNativeAssets)' == 'true' AND !$(BuildNative) "
104+
<!-- Always explicitly include the .pdb -->
105+
<NativeRuntimeAsset Condition=" '$(UseIisNativeAssets)' == 'true' "
105106
Include="$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.pdb" />
106107
</ItemGroup>
107108

@@ -118,6 +119,14 @@
118119
<_TransportPdbs Include="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.pdb"
119120
Exclude="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.ni.pdb" />
120121

122+
<!-- Dedupe System.Security.Cryptography.Pkcs.pdb based on RID -->
123+
<!-- If we get rid of our custom reference resolution here, we can let nuget handle this -->
124+
<_TransportPdbs Remove="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\lib\**\System.Security.Cryptography.Pkcs.pdb"
125+
Condition="'$(TargetOsName)' == 'win'" />
126+
127+
<_TransportPdbs Remove="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\runtimes\win\**\System.Security.Cryptography.Pkcs.pdb"
128+
Condition="'$(TargetOsName)' != 'win'" />
129+
121130
<_SymbolFilesToPackage Include="@(_TransportPdbs)"
122131
Condition="'$(FileNameList)' != '' and $(FileNameList.Contains('%(Filename);'))" />
123132
</ItemGroup>

‎src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
<GenerateInstallers Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</GenerateInstallers>
4747
<BuildDebPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64'">true</BuildDebPackage>
4848
<BuildRpmPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64'">true</BuildRpmPackage>
49+
<UseArcadeRpmTooling>true</UseArcadeRpmTooling>
4950
<GenerateVSInsertionPackages>true</GenerateVSInsertionPackages>
5051
</PropertyGroup>
5152

@@ -97,7 +98,8 @@
9798

9899
<NativeRuntimeAsset Condition=" '$(UseIisNativeAssets)' == 'true' AND !$(BuildNative) "
99100
Include="$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.dll" />
100-
<NativeRuntimeAsset Condition=" '$(UseIisNativeAssets)' == 'true' AND !$(BuildNative) "
101+
<!-- Always explicitly include the .pdb -->
102+
<NativeRuntimeAsset Condition=" '$(UseIisNativeAssets)' == 'true' "
101103
Include="$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.pdb" />
102104
</ItemGroup>
103105

@@ -114,6 +116,14 @@
114116
<_TransportPdbs Include="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.pdb"
115117
Exclude="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.ni.pdb" />
116118

119+
<!-- Dedupe System.Security.Cryptography.Pkcs.pdb based on RID -->
120+
<!-- If we get rid of our custom reference resolution here, we can let nuget handle this -->
121+
<_TransportPdbs Remove="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\lib\**\System.Security.Cryptography.Pkcs.pdb"
122+
Condition="'$(TargetOsName)' == 'win'" />
123+
124+
<_TransportPdbs Remove="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\runtimes\win\**\System.Security.Cryptography.Pkcs.pdb"
125+
Condition="'$(TargetOsName)' != 'win'" />
126+
117127
<_SymbolFilesToPackage Include="@(_TransportPdbs)"
118128
Condition="'$(FileNameList)' != '' and $(FileNameList.Contains('%(Filename);'))" />
119129
</ItemGroup>

0 commit comments

Comments
 (0)