Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
2 changes: 1 addition & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,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-455f135" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-455f1358/nuget/v3/index.json" />
<add key="darc-pub-dotnet-dotnet-3633524" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-3633524e/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
50 changes: 25 additions & 25 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,31 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26070.104</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.26070.104</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetCMakeSdkPackageVersion>10.0.0-beta.26070.104</MicrosoftDotNetCMakeSdkPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.26070.104</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.26070.104</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.26070.104</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>10.0.0-beta.26070.104</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
<MicrosoftNETSdkILPackageVersion>10.0.3</MicrosoftNETSdkILPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.3</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>10.0.3</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>10.0.3</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.3-servicing.26070.104</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>10.0.3</MicrosoftWin32SystemEventsPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.3</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.3</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<SystemCodeDomPackageVersion>10.0.3</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.3</SystemConfigurationConfigurationManagerPackageVersion>
<SystemFormatsNrbfPackageVersion>10.0.3</SystemFormatsNrbfPackageVersion>
<SystemIOHashingPackageVersion>10.0.3</SystemIOHashingPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>10.0.3</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>10.0.3</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>10.0.3</SystemRuntimeSerializationFormattersPackageVersion>
<SystemTextEncodingsWebPackageVersion>10.0.3</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>10.0.3</SystemTextJsonPackageVersion>
<SystemWindowsExtensionsPackageVersion>10.0.3</SystemWindowsExtensionsPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26072.113</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.26072.113</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetCMakeSdkPackageVersion>10.0.0-beta.26072.113</MicrosoftDotNetCMakeSdkPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.26072.113</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.26072.113</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.26072.113</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>10.0.0-beta.26072.113</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
<MicrosoftNETSdkILPackageVersion>10.0.4</MicrosoftNETSdkILPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.4</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>10.0.4</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>10.0.4</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.4-servicing.26072.113</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>10.0.4</MicrosoftWin32SystemEventsPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.4</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.4</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<SystemCodeDomPackageVersion>10.0.4</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.4</SystemConfigurationConfigurationManagerPackageVersion>
<SystemFormatsNrbfPackageVersion>10.0.4</SystemFormatsNrbfPackageVersion>
<SystemIOHashingPackageVersion>10.0.4</SystemIOHashingPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>10.0.4</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>10.0.4</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>10.0.4</SystemRuntimeSerializationFormattersPackageVersion>
<SystemTextEncodingsWebPackageVersion>10.0.4</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>10.0.4</SystemTextJsonPackageVersion>
<SystemWindowsExtensionsPackageVersion>10.0.4</SystemWindowsExtensionsPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
Expand Down
102 changes: 51 additions & 51 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,110 +6,110 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
And you can check these with "darc get-dependencies <dash dash>target-repo "winforms"
-->
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="455f1358f39b4d38fa3893c327a45027c4a81843" BarId="297972" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="3633524e6b0b93b2b43f66b663b5532e32d70136" BarId="298455" />
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.3-servicing.26070.104">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.4-servicing.26072.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
<Sha>3633524e6b0b93b2b43f66b663b5532e32d70136</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="10.0.3">
<Dependency Name="System.Resources.Extensions" Version="10.0.4">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
<Sha>3633524e6b0b93b2b43f66b663b5532e32d70136</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="10.0.3">
<Dependency Name="System.Windows.Extensions" Version="10.0.4">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
<Sha>3633524e6b0b93b2b43f66b663b5532e32d70136</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.3">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.4">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
<Sha>3633524e6b0b93b2b43f66b663b5532e32d70136</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.3">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.4">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
<Sha>3633524e6b0b93b2b43f66b663b5532e32d70136</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.3">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.4">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
<Sha>3633524e6b0b93b2b43f66b663b5532e32d70136</Sha>
</Dependency>
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.3">
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.4">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
<Sha>3633524e6b0b93b2b43f66b663b5532e32d70136</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.3">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.4">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
<Sha>3633524e6b0b93b2b43f66b663b5532e32d70136</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.3">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.4">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
<Sha>3633524e6b0b93b2b43f66b663b5532e32d70136</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="10.0.3">
<Dependency Name="System.Text.Encodings.Web" Version="10.0.4">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
<Sha>3633524e6b0b93b2b43f66b663b5532e32d70136</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="10.0.3">
<Dependency Name="System.Text.Json" Version="10.0.4">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
<Sha>3633524e6b0b93b2b43f66b663b5532e32d70136</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.3">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.4">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
<Sha>3633524e6b0b93b2b43f66b663b5532e32d70136</Sha>
</Dependency>
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.3">
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.4">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
<Sha>3633524e6b0b93b2b43f66b663b5532e32d70136</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.3">
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.4">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
<Sha>3633524e6b0b93b2b43f66b663b5532e32d70136</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="10.0.3">
<Dependency Name="System.CodeDom" Version="10.0.4">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
<Sha>3633524e6b0b93b2b43f66b663b5532e32d70136</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.3">
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.4">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
<Sha>3633524e6b0b93b2b43f66b663b5532e32d70136</Sha>
</Dependency>
<Dependency Name="System.Formats.Nrbf" Version="10.0.3">
<Dependency Name="System.Formats.Nrbf" Version="10.0.4">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
<Sha>3633524e6b0b93b2b43f66b663b5532e32d70136</Sha>
</Dependency>
<Dependency Name="System.IO.Hashing" Version="10.0.3">
<Dependency Name="System.IO.Hashing" Version="10.0.4">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
<Sha>3633524e6b0b93b2b43f66b663b5532e32d70136</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<!-- Arcade -->
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26070.104">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26072.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
<Sha>3633524e6b0b93b2b43f66b663b5532e32d70136</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.26070.104">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.26072.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
<Sha>3633524e6b0b93b2b43f66b663b5532e32d70136</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.26070.104">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.26072.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
<Sha>3633524e6b0b93b2b43f66b663b5532e32d70136</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26070.104">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26072.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
<Sha>3633524e6b0b93b2b43f66b663b5532e32d70136</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.26070.104">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.26072.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
<Sha>3633524e6b0b93b2b43f66b663b5532e32d70136</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="10.0.0-beta.26070.104">
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="10.0.0-beta.26072.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
<Sha>3633524e6b0b93b2b43f66b663b5532e32d70136</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.26070.104">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.26072.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
<Sha>3633524e6b0b93b2b43f66b663b5532e32d70136</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
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>3</PatchVersion>
<PatchVersion>4</PatchVersion>
<!-- version in our package name #.#.#-below.#####.## -->
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<PreReleaseVersionIteration></PreReleaseVersionIteration>
Expand Down
8 changes: 4 additions & 4 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26070.104",
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.26070.104",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26070.104",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26072.113",
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.26072.113",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26072.113",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "10.0.3"
"Microsoft.NET.Sdk.IL": "10.0.4"
},
"native-tools": {
"cmake": "latest"
Expand Down
Loading