Skip to content

Commit 0aaec26

Browse files
harshit7962harshit7962
authored
Merge pull request #11035 from vseanreesermsft/internal-merge-8.0-2025-08-06-0844
Merging internal commits for release/8.0
2 parents 67b1657 + 94005e5 commit 0aaec26

File tree

5 files changed

+29
-45
lines changed

5 files changed

+29
-45
lines changed

‎NuGet.config‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,10 @@
55
<clear />
66
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
77
<!-- Begin: Package sources from dotnet-runtime -->
8-
<add key="darc-int-dotnet-runtime-ef853a7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-ef853a71/nuget/v3/index.json" />
9-
<add key="darc-int-dotnet-runtime-77545d6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-77545d6f/nuget/v3/index.json" />
10-
<add key="darc-int-dotnet-runtime-77545d6-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-77545d6f-3/nuget/v3/index.json" />
11-
<add key="darc-int-dotnet-runtime-77545d6-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-77545d6f-2/nuget/v3/index.json" />
12-
<add key="darc-int-dotnet-runtime-77545d6-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-77545d6f-1/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-runtime-fce8ed9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-fce8ed90/nuget/v3/index.json" />
139
<!-- End: Package sources from dotnet-runtime -->
1410
<!-- Begin: Package sources from dotnet-winforms -->
15-
<add key="darc-int-dotnet-winforms-92d43c6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-92d43c65/nuget/v3/index.json" />
16-
<add key="darc-int-dotnet-winforms-f3291ac" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-f3291ace/nuget/v3/index.json" />
17-
<add key="darc-int-dotnet-winforms-f3291ac-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-f3291ace-3/nuget/v3/index.json" />
18-
<add key="darc-int-dotnet-winforms-f3291ac-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-f3291ace-2/nuget/v3/index.json" />
19-
<add key="darc-int-dotnet-winforms-f3291ac-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-f3291ace-1/nuget/v3/index.json" />
11+
<add key="darc-int-dotnet-winforms-1957eae" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-1957eae5/nuget/v3/index.json" />
2012
<!-- End: Package sources from dotnet-winforms -->
2113
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2214
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -30,18 +22,10 @@
3022
<disabledPackageSources>
3123
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
3224
<!-- Begin: Package sources from dotnet-runtime -->
33-
<add key="darc-int-dotnet-runtime-77545d6-1" value="true" />
34-
<add key="darc-int-dotnet-runtime-77545d6-2" value="true" />
35-
<add key="darc-int-dotnet-runtime-77545d6-3" value="true" />
36-
<add key="darc-int-dotnet-runtime-77545d6" value="true" />
37-
<add key="darc-int-dotnet-runtime-ef853a7" value="true" />
25+
<add key="darc-int-dotnet-runtime-fce8ed9" value="true" />
3826
<!-- End: Package sources from dotnet-runtime -->
3927
<!-- Begin: Package sources from dotnet-winforms -->
40-
<add key="darc-int-dotnet-winforms-92d43c6" value="true" />
41-
<add key="darc-int-dotnet-winforms-f3291ac-1" value="true" />
42-
<add key="darc-int-dotnet-winforms-f3291ac-2" value="true" />
43-
<add key="darc-int-dotnet-winforms-f3291ac-3" value="true" />
44-
<add key="darc-int-dotnet-winforms-f3291ac" value="true" />
28+
<add key="darc-int-dotnet-winforms-1957eae" value="true" />
4529
<!-- End: Package sources from dotnet-winforms -->
4630
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4731
</disabledPackageSources>

‎azure-pipelines.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ resources:
4747
- repository: 1ESPipelineTemplates
4848
type: git
4949
name: 1ESPipelineTemplates/1ESPipelineTemplates
50-
ref: refs/tags/release
50+
ref: refs/tags/release-2025-07-08-1
5151
extends:
5252
template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
5353
parameters:

‎eng/Version.Details.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Private.Winforms" Version="8.0.18-servicing.25312.3">
4+
<Dependency Name="Microsoft.Private.Winforms" Version="8.0.19-servicing.25367.3">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
6-
<Sha>92d43c655032c60ddf0b3727041e05c93055ee97</Sha>
6+
<Sha>1957eae58462d524ab5ba1ee3b335405082dc05f</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.18-servicing.25312.3">
8+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.19-servicing.25367.3">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>92d43c655032c60ddf0b3727041e05c93055ee97</Sha>
10+
<Sha>1957eae58462d524ab5ba1ee3b335405082dc05f</Sha>
1111
</Dependency>
1212
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1" CoherentParentDependency="Microsoft.Private.Winforms">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -17,9 +17,9 @@
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
1818
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.18-servicing.25311.17" CoherentParentDependency="Microsoft.Private.Winforms">
20+
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.19-servicing.25365.14" CoherentParentDependency="Microsoft.Private.Winforms">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
22-
<Sha>ef853a71052646a42abf17e888ec6d9a69614ad9</Sha>
22+
<Sha>fce8ed90dc43047eabec2b32c04ee46b789ad5d1</Sha>
2323
</Dependency>
2424
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="8.0.0-rtm.25168.2">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
@@ -29,17 +29,17 @@
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
3030
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.18" CoherentParentDependency="Microsoft.Private.Winforms">
32+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.19" CoherentParentDependency="Microsoft.Private.Winforms">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
34-
<Sha>ef853a71052646a42abf17e888ec6d9a69614ad9</Sha>
34+
<Sha>fce8ed90dc43047eabec2b32c04ee46b789ad5d1</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.18" CoherentParentDependency="Microsoft.Private.Winforms">
36+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.19" CoherentParentDependency="Microsoft.Private.Winforms">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
38-
<Sha>ef853a71052646a42abf17e888ec6d9a69614ad9</Sha>
38+
<Sha>fce8ed90dc43047eabec2b32c04ee46b789ad5d1</Sha>
3939
</Dependency>
40-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.18-servicing.25311.17" CoherentParentDependency="Microsoft.Private.Winforms">
40+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.19-servicing.25365.14" CoherentParentDependency="Microsoft.Private.Winforms">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
42-
<Sha>ef853a71052646a42abf17e888ec6d9a69614ad9</Sha>
42+
<Sha>fce8ed90dc43047eabec2b32c04ee46b789ad5d1</Sha>
4343
</Dependency>
4444
<!-- These dependencies are required by windowsdesktop for coherency. -->
4545
<Dependency Name="Microsoft.Win32.Registry.AccessControl" Version="8.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
@@ -150,9 +150,9 @@
150150
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
151151
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
152152
</Dependency>
153-
<Dependency Name="System.Drawing.Common" Version="8.0.18">
153+
<Dependency Name="System.Drawing.Common" Version="8.0.19">
154154
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
155-
<Sha>92d43c655032c60ddf0b3727041e05c93055ee97</Sha>
155+
<Sha>1957eae58462d524ab5ba1ee3b335405082dc05f</Sha>
156156
</Dependency>
157157
</ProductDependencies>
158158
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@
2222
</PropertyGroup>
2323
<!-- Packages that come from https://github.com/dotnet/winforms -->
2424
<PropertyGroup>
25-
<MicrosoftPrivateWinformsVersion>8.0.18-servicing.25312.3</MicrosoftPrivateWinformsVersion>
25+
<MicrosoftPrivateWinformsVersion>8.0.19-servicing.25367.3</MicrosoftPrivateWinformsVersion>
2626
</PropertyGroup>
2727
<!-- Packages that come from https://github.com/dotnet/runtime -->
2828
<PropertyGroup>
29-
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.18-servicing.25311.17</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
30-
<MicrosoftNETCoreAppRefVersion>8.0.18</MicrosoftNETCoreAppRefVersion>
31-
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.18</MicrosoftNETCoreAppRuntimewinx64Version>
32-
<MicrosoftNETCorePlatformsVersion>8.0.18-servicing.25311.17</MicrosoftNETCorePlatformsVersion>
29+
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.19-servicing.25365.14</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
30+
<MicrosoftNETCoreAppRefVersion>8.0.19</MicrosoftNETCoreAppRefVersion>
31+
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.19</MicrosoftNETCoreAppRuntimewinx64Version>
32+
<MicrosoftNETCorePlatformsVersion>8.0.19-servicing.25365.14</MicrosoftNETCorePlatformsVersion>
3333
<SystemCodeDomPackageVersion>8.0.0</SystemCodeDomPackageVersion>
3434
<SystemConfigurationConfigurationManagerPackageVersion>8.0.1</SystemConfigurationConfigurationManagerPackageVersion>
3535
<SystemDiagnosticsEventLogPackageVersion>8.0.2</SystemDiagnosticsEventLogPackageVersion>
36-
<SystemDrawingCommonVersion>8.0.18</SystemDrawingCommonVersion>
36+
<SystemDrawingCommonVersion>8.0.19</SystemDrawingCommonVersion>
3737
<SystemDirectoryServicesVersion>8.0.0</SystemDirectoryServicesVersion>
3838
<SystemIOPackagingVersion>8.0.1</SystemIOPackagingVersion>
3939
<SystemReflectionMetadataLoadContextVersion>8.0.1</SystemReflectionMetadataLoadContextVersion>

‎eng/pipeline.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ jobs:
2727
pool:
2828
${{ if eq(variables['System.TeamProject'], 'public') }}:
2929
name: NetCore-Public
30-
demands: ImageOverride -equals windows.vs2022preview.amd64.Open
30+
demands: ImageOverride -equals windows.vs2022.amd64.Open
3131
${{ if eq(variables['System.TeamProject'], 'internal') }}:
3232
name: NetCore1ESPool-Internal
33-
demands: ImageOverride -equals windows.vs2022preview.amd64
33+
demands: ImageOverride -equals windows.vs2022.amd64
3434
helixRepo: $(repoName)
3535
jobs:
3636
- job: Windows_NT
@@ -41,10 +41,10 @@ jobs:
4141
# agent pool can't be read from a user-defined variable (Azure DevOps limitation)
4242
${{ if eq(variables['System.TeamProject'], 'public') }}:
4343
name: NetCore-Public
44-
demands: ImageOverride -equals windows.vs2022preview.amd64.Open
44+
demands: ImageOverride -equals windows.vs2022.amd64.Open
4545
${{ if eq(variables['System.TeamProject'], 'internal') }}:
4646
name: NetCore1ESPool-Internal
47-
demands: ImageOverride -equals windows.vs2022preview.amd64
47+
demands: ImageOverride -equals windows.vs2022.amd64
4848
variables:
4949
- name: Codeql.Enabled
5050
value: true

0 commit comments

Comments
 (0)