Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-dotnet -->
<add key="darc-pub-dotnet-dotnet-93970af" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-93970af2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-dotnet-5ddd0dd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-5ddd0ddc/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-dotnet -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
Expand Down
44 changes: 22 additions & 22 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props
<!-- dotnet/dotnet dependencies -->
<MicrosoftBuildFrameworkPackageVersion>15.9.20</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>15.9.20</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25563.104</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25563.104</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25563.104</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25563.104</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.1-servicing.25563.104</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.1</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.1-servicing.25563.104</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftPrivateWinformsPackageVersion>10.0.1-servicing.25563.104</MicrosoftPrivateWinformsPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25603.103</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25603.103</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25603.103</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25603.103</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.2-servicing.25603.103</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.2</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.2-servicing.25603.103</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftPrivateWinformsPackageVersion>10.0.2-servicing.25603.103</MicrosoftPrivateWinformsPackageVersion>
<MicrosoftSourceLinkAzureReposGitPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitPackageVersion>
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubPackageVersion>
<SystemCodeDomPackageVersion>10.0.1</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.1</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>10.0.1</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesPackageVersion>10.0.1</SystemDirectoryServicesPackageVersion>
<SystemDrawingCommonPackageVersion>10.0.1</SystemDrawingCommonPackageVersion>
<SystemFormatsNrbfPackageVersion>10.0.1</SystemFormatsNrbfPackageVersion>
<SystemIOPackagingPackageVersion>10.0.1</SystemIOPackagingPackageVersion>
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.1-servicing.25563.104</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>10.0.1</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>10.0.1</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>10.0.1</SystemRuntimeSerializationFormattersPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>10.0.1</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>10.0.1</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>10.0.1</SystemWindowsExtensionsPackageVersion>
<SystemCodeDomPackageVersion>10.0.2</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.2</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>10.0.2</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesPackageVersion>10.0.2</SystemDirectoryServicesPackageVersion>
<SystemDrawingCommonPackageVersion>10.0.2</SystemDrawingCommonPackageVersion>
<SystemFormatsNrbfPackageVersion>10.0.2</SystemFormatsNrbfPackageVersion>
<SystemIOPackagingPackageVersion>10.0.2</SystemIOPackagingPackageVersion>
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.2-servicing.25603.103</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>10.0.2</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>10.0.2</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>10.0.2</SystemRuntimeSerializationFormattersPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>10.0.2</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>10.0.2</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>10.0.2</SystemWindowsExtensionsPackageVersion>
<!-- _git/dotnet-wpf-int dependencies -->
<MicrosoftDotNetWpfDncEngPackageVersion>10.0.2-servicing.25569.2</MicrosoftDotNetWpfDncEngPackageVersion>
</PropertyGroup>
Expand Down
90 changes: 45 additions & 45 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,78 +1,78 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="93970af2dae989c795efb703be9a25ff95079f25" BarId="290774" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="5ddd0ddc0ebadca21645a05c419ed5a034454605" BarId="293194" />
<ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.1-servicing.25563.104">
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.2-servicing.25603.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.1-servicing.25563.104">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.2-servicing.25603.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.1">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.2">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="10.0.1">
<Dependency Name="System.Windows.Extensions" Version="10.0.2">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.1-servicing.25563.104">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.2-servicing.25603.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.2-servicing.25569.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
<Sha>159a1162b1dff6dcdf066afcae49852c87e03301</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="10.0.1">
<Dependency Name="System.Resources.Extensions" Version="10.0.2">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
</Dependency>
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.1">
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.2">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.1">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.2">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="10.0.1">
<Dependency Name="System.CodeDom" Version="10.0.2">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.1">
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.2">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.1">
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.2">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="10.0.1">
<Dependency Name="System.DirectoryServices" Version="10.0.2">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
</Dependency>
<Dependency Name="System.Formats.Nrbf" Version="10.0.1">
<Dependency Name="System.Formats.Nrbf" Version="10.0.2">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="10.0.1">
<Dependency Name="System.IO.Packaging" Version="10.0.2">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.1">
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.2">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="10.0.1">
<Dependency Name="System.Security.Permissions" Version="10.0.2">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="10.0.1">
<Dependency Name="System.Drawing.Common" Version="10.0.2">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Framework" Version="15.9.20">
<Uri>https://github.com/dotnet/dotnet</Uri>
Expand All @@ -84,25 +84,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.1-servicing.25563.104">
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.2-servicing.25603.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25563.104">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25603.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25563.104">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25603.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25563.104">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25603.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25563.104">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25603.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
</Dependency>
<!-- TODO: Unpin sourcelink dependencies: https://github.com/dotnet/wpf/issues/11042 -->
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2" Pinned="true">
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<PropertyGroup>
<MajorVersion>10</MajorVersion>
<MinorVersion>0</MinorVersion>
<PatchVersion>1</PatchVersion>
<PatchVersion>2</PatchVersion>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<PreReleaseVersionIteration></PreReleaseVersionIteration>
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
Expand Down
8 changes: 4 additions & 4 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "10.0.100-rc.2.25502.107",
"version": "10.0.100",
"allowPrerelease": true,
"rollForward": "latestFeature",
"paths": [
Expand All @@ -10,7 +10,7 @@
"errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it."
},
"tools": {
"dotnet": "10.0.100-rc.2.25502.107",
"dotnet": "10.0.100",
"runtimes": {
"dotnet/x64": [
"$(MicrosoftNETCorePlatformsVersion)"
Expand All @@ -24,8 +24,8 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25563.104",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25563.104",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25603.103",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25603.103",
"Microsoft.Build.NoTargets": "3.7.56"
},
"native-tools": {
Expand Down
Loading