Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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>11.0.0-beta.25502.108</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.25502.108</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.25502.108</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25502.108</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rc.1.25502.108</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25502.108</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25502.108</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rc.1.25502.108</MicrosoftPrivateWinformsPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25504.101</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.25504.101</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.25504.101</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25504.101</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rc.1.25504.101</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25504.101</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25504.101</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rc.1.25504.101</MicrosoftPrivateWinformsPackageVersion>
<MicrosoftSourceLinkAzureReposGitPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitPackageVersion>
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubPackageVersion>
<SystemCodeDomPackageVersion>10.0.0-rc.1.25502.108</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.1.25502.108</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>10.0.0-rc.1.25502.108</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesPackageVersion>10.0.0-rc.1.25502.108</SystemDirectoryServicesPackageVersion>
<SystemDrawingCommonPackageVersion>10.0.0-rc.1.25502.108</SystemDrawingCommonPackageVersion>
<SystemFormatsNrbfPackageVersion>10.0.0-rc.1.25502.108</SystemFormatsNrbfPackageVersion>
<SystemIOPackagingPackageVersion>10.0.0-rc.1.25502.108</SystemIOPackagingPackageVersion>
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rc.1.25502.108</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.1.25502.108</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.1.25502.108</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.1.25502.108</SystemRuntimeSerializationFormattersPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-rc.1.25502.108</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>10.0.0-rc.1.25502.108</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.1.25502.108</SystemWindowsExtensionsPackageVersion>
<SystemCodeDomPackageVersion>10.0.0-rc.1.25504.101</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.1.25504.101</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>10.0.0-rc.1.25504.101</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesPackageVersion>10.0.0-rc.1.25504.101</SystemDirectoryServicesPackageVersion>
<SystemDrawingCommonPackageVersion>10.0.0-rc.1.25504.101</SystemDrawingCommonPackageVersion>
<SystemFormatsNrbfPackageVersion>10.0.0-rc.1.25504.101</SystemFormatsNrbfPackageVersion>
<SystemIOPackagingPackageVersion>10.0.0-rc.1.25504.101</SystemIOPackagingPackageVersion>
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rc.1.25504.101</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.1.25504.101</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.1.25504.101</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.1.25504.101</SystemRuntimeSerializationFormattersPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-rc.1.25504.101</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>10.0.0-rc.1.25504.101</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.1.25504.101</SystemWindowsExtensionsPackageVersion>
<!-- _git/dotnet-wpf-int dependencies -->
<MicrosoftDotNetWpfDncEngPackageVersion>10.0.0-rc.1.25466.1</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="fe6b307fbb764027be9a10b978063bd742763982" BarId="285582" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="6d386b1208aec59da8295530c896e0f4c31bc953" BarId="285790" />
<ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rc.1.25502.108">
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rc.1.25504.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
<Sha>6d386b1208aec59da8295530c896e0f4c31bc953</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rc.1.25502.108">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rc.1.25504.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
<Sha>6d386b1208aec59da8295530c896e0f4c31bc953</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.1.25502.108">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.1.25504.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
<Sha>6d386b1208aec59da8295530c896e0f4c31bc953</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.1.25502.108">
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.1.25504.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
<Sha>6d386b1208aec59da8295530c896e0f4c31bc953</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25502.108">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25504.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
<Sha>6d386b1208aec59da8295530c896e0f4c31bc953</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.0-rc.1.25466.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
<Sha>3567f4b428acc1a49fda38d150415482cc916dd8</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.1.25502.108">
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.1.25504.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
<Sha>6d386b1208aec59da8295530c896e0f4c31bc953</Sha>
</Dependency>
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.1.25502.108">
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.1.25504.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
<Sha>6d386b1208aec59da8295530c896e0f4c31bc953</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25502.108">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25504.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
<Sha>6d386b1208aec59da8295530c896e0f4c31bc953</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="10.0.0-rc.1.25502.108">
<Dependency Name="System.CodeDom" Version="10.0.0-rc.1.25504.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
<Sha>6d386b1208aec59da8295530c896e0f4c31bc953</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.1.25502.108">
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.1.25504.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
<Sha>6d386b1208aec59da8295530c896e0f4c31bc953</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-rc.1.25502.108">
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-rc.1.25504.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
<Sha>6d386b1208aec59da8295530c896e0f4c31bc953</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="10.0.0-rc.1.25502.108">
<Dependency Name="System.DirectoryServices" Version="10.0.0-rc.1.25504.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
<Sha>6d386b1208aec59da8295530c896e0f4c31bc953</Sha>
</Dependency>
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.1.25502.108">
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.1.25504.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
<Sha>6d386b1208aec59da8295530c896e0f4c31bc953</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="10.0.0-rc.1.25502.108">
<Dependency Name="System.IO.Packaging" Version="10.0.0-rc.1.25504.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
<Sha>6d386b1208aec59da8295530c896e0f4c31bc953</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-rc.1.25502.108">
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-rc.1.25504.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
<Sha>6d386b1208aec59da8295530c896e0f4c31bc953</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="10.0.0-rc.1.25502.108">
<Dependency Name="System.Security.Permissions" Version="10.0.0-rc.1.25504.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
<Sha>6d386b1208aec59da8295530c896e0f4c31bc953</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="10.0.0-rc.1.25502.108">
<Dependency Name="System.Drawing.Common" Version="10.0.0-rc.1.25504.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
<Sha>6d386b1208aec59da8295530c896e0f4c31bc953</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Framework" Version="15.9.20">
<Uri>https://github.com/dotnet/dotnet</Uri>
Expand All @@ -84,21 +84,21 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25502.108">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25504.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
<Sha>6d386b1208aec59da8295530c896e0f4c31bc953</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="11.0.0-beta.25502.108">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="11.0.0-beta.25504.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
<Sha>6d386b1208aec59da8295530c896e0f4c31bc953</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25502.108">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25504.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
<Sha>6d386b1208aec59da8295530c896e0f4c31bc953</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.25502.108">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.25504.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
<Sha>6d386b1208aec59da8295530c896e0f4c31bc953</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 All @@ -109,9 +109,9 @@
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e9f665e52848a3615736c099e5631af531b66a5c</Sha>
</Dependency>
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rc.1.25502.108">
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rc.1.25504.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
<Sha>6d386b1208aec59da8295530c896e0f4c31bc953</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25502.108",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25502.108",
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25504.101",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25504.101",
"Microsoft.Build.NoTargets": "3.7.56"
},
"native-tools": {
Expand Down