Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
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-115a295-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-115a2957-1/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
16 changes: 8 additions & 8 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ 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>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25568.102</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25568.102</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25568.102</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25568.102</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.1-servicing.25568.102</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.1</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.1-servicing.25563.104</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftPrivateWinformsPackageVersion>10.0.1-servicing.25563.104</MicrosoftPrivateWinformsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.1-servicing.25568.102</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftPrivateWinformsPackageVersion>10.0.1-servicing.25568.102</MicrosoftPrivateWinformsPackageVersion>
<MicrosoftSourceLinkAzureReposGitPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitPackageVersion>
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubPackageVersion>
<SystemCodeDomPackageVersion>10.0.1</SystemCodeDomPackageVersion>
Expand All @@ -25,7 +25,7 @@ This file should be imported by eng/Versions.props
<SystemDrawingCommonPackageVersion>10.0.1</SystemDrawingCommonPackageVersion>
<SystemFormatsNrbfPackageVersion>10.0.1</SystemFormatsNrbfPackageVersion>
<SystemIOPackagingPackageVersion>10.0.1</SystemIOPackagingPackageVersion>
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.1-servicing.25563.104</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.1-servicing.25568.102</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>10.0.1</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>10.0.1</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>10.0.1</SystemRuntimeSerializationFormattersPackageVersion>
Expand Down
62 changes: 31 additions & 31 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="115a29577547ce136b754d96d2ebfb184595a923" BarId="291265" />
<ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.1-servicing.25563.104">
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.1-servicing.25568.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.1-servicing.25563.104">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.1-servicing.25568.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.1">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="10.0.1">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.1-servicing.25563.104">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.1-servicing.25568.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.1-servicing.25567.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
<Sha>7587e9db408301bea08beb3424c75828e30107d1</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="10.0.1">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
</Dependency>
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.1">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.1">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="10.0.1">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.1">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.1">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="10.0.1">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
</Dependency>
<Dependency Name="System.Formats.Nrbf" Version="10.0.1">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="10.0.1">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.1">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="10.0.1">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="10.0.1">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</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.1-servicing.25568.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</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.25568.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25563.104">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25568.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</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.25568.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25563.104">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25568.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
<Sha>115a29577547ce136b754d96d2ebfb184595a923</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
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": "10.0.0-beta.25563.104",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25563.104",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25568.102",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25568.102",
"Microsoft.Build.NoTargets": "3.7.56"
},
"native-tools": {
Expand Down