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
52 changes: 26 additions & 26 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,32 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet-dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26201.113</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26201.113</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetCMakeSdkPackageVersion>11.0.0-beta.26201.113</MicrosoftDotNetCMakeSdkPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>11.0.0-beta.26201.113</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26201.113</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>11.0.0-beta.26201.113</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>11.0.0-beta.26201.113</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
<MicrosoftNETSdkILPackageVersion>11.0.0-preview.4.26201.113</MicrosoftNETSdkILPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.4.26201.113</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.4.26201.113</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>11.0.0-preview.4.26201.113</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-preview.4.26201.113</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>11.0.0-preview.4.26201.113</MicrosoftWin32SystemEventsPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.4.26201.113</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.4.26201.113</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<SystemCodeDomPackageVersion>11.0.0-preview.4.26201.113</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>11.0.0-preview.4.26201.113</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>11.0.0-preview.4.26201.113</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemFormatsNrbfPackageVersion>11.0.0-preview.4.26201.113</SystemFormatsNrbfPackageVersion>
<SystemIOHashingPackageVersion>11.0.0-preview.4.26201.113</SystemIOHashingPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>11.0.0-preview.4.26201.113</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>11.0.0-preview.4.26201.113</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>11.0.0-preview.4.26201.113</SystemRuntimeSerializationFormattersPackageVersion>
<SystemTextEncodingsWebPackageVersion>11.0.0-preview.4.26201.113</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>11.0.0-preview.4.26201.113</SystemTextJsonPackageVersion>
<SystemWindowsExtensionsPackageVersion>11.0.0-preview.4.26201.113</SystemWindowsExtensionsPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26202.104</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26202.104</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetCMakeSdkPackageVersion>11.0.0-beta.26202.104</MicrosoftDotNetCMakeSdkPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>11.0.0-beta.26202.104</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26202.104</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>11.0.0-beta.26202.104</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>11.0.0-beta.26202.104</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
<MicrosoftNETSdkILPackageVersion>11.0.0-preview.4.26202.104</MicrosoftNETSdkILPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.4.26202.104</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.4.26202.104</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>11.0.0-preview.4.26202.104</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-preview.4.26202.104</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>11.0.0-preview.4.26202.104</MicrosoftWin32SystemEventsPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.4.26202.104</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.4.26202.104</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<SystemCodeDomPackageVersion>11.0.0-preview.4.26202.104</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>11.0.0-preview.4.26202.104</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>11.0.0-preview.4.26202.104</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemFormatsNrbfPackageVersion>11.0.0-preview.4.26202.104</SystemFormatsNrbfPackageVersion>
<SystemIOHashingPackageVersion>11.0.0-preview.4.26202.104</SystemIOHashingPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>11.0.0-preview.4.26202.104</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>11.0.0-preview.4.26202.104</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>11.0.0-preview.4.26202.104</SystemRuntimeSerializationFormattersPackageVersion>
<SystemTextEncodingsWebPackageVersion>11.0.0-preview.4.26202.104</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>11.0.0-preview.4.26202.104</SystemTextJsonPackageVersion>
<SystemWindowsExtensionsPackageVersion>11.0.0-preview.4.26202.104</SystemWindowsExtensionsPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
Expand Down
106 changes: 53 additions & 53 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,114 +6,114 @@ 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="185a5cc19c0edff3dd2e0acdea9a182d9f077d36" BarId="308823" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="0d6cc667e66d7bec23439335118137f78c70306c" BarId="309010" />
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-preview.4.26201.113">
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-preview.4.26202.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</Sha>
<Sha>0d6cc667e66d7bec23439335118137f78c70306c</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="11.0.0-preview.4.26201.113">
<Dependency Name="System.Resources.Extensions" Version="11.0.0-preview.4.26202.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</Sha>
<Sha>0d6cc667e66d7bec23439335118137f78c70306c</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="11.0.0-preview.4.26201.113">
<Dependency Name="System.Windows.Extensions" Version="11.0.0-preview.4.26202.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</Sha>
<Sha>0d6cc667e66d7bec23439335118137f78c70306c</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="11.0.0-preview.4.26201.113">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="11.0.0-preview.4.26202.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</Sha>
<Sha>0d6cc667e66d7bec23439335118137f78c70306c</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="11.0.0-preview.4.26201.113">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="11.0.0-preview.4.26202.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</Sha>
<Sha>0d6cc667e66d7bec23439335118137f78c70306c</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="11.0.0-preview.4.26201.113">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="11.0.0-preview.4.26202.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</Sha>
<Sha>0d6cc667e66d7bec23439335118137f78c70306c</Sha>
</Dependency>
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="11.0.0-preview.4.26201.113">
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="11.0.0-preview.4.26202.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</Sha>
<Sha>0d6cc667e66d7bec23439335118137f78c70306c</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="11.0.0-preview.4.26201.113">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="11.0.0-preview.4.26202.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</Sha>
<Sha>0d6cc667e66d7bec23439335118137f78c70306c</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="11.0.0-preview.4.26201.113">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="11.0.0-preview.4.26202.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</Sha>
<Sha>0d6cc667e66d7bec23439335118137f78c70306c</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="11.0.0-preview.4.26201.113">
<Dependency Name="System.Text.Encodings.Web" Version="11.0.0-preview.4.26202.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</Sha>
<Sha>0d6cc667e66d7bec23439335118137f78c70306c</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="11.0.0-preview.4.26201.113">
<Dependency Name="System.Text.Json" Version="11.0.0-preview.4.26202.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</Sha>
<Sha>0d6cc667e66d7bec23439335118137f78c70306c</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.4.26201.113">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.4.26202.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</Sha>
<Sha>0d6cc667e66d7bec23439335118137f78c70306c</Sha>
</Dependency>
<Dependency Name="System.Runtime.Serialization.Formatters" Version="11.0.0-preview.4.26201.113">
<Dependency Name="System.Runtime.Serialization.Formatters" Version="11.0.0-preview.4.26202.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</Sha>
<Sha>0d6cc667e66d7bec23439335118137f78c70306c</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="11.0.0-preview.4.26201.113">
<Dependency Name="Microsoft.Win32.SystemEvents" Version="11.0.0-preview.4.26202.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</Sha>
<Sha>0d6cc667e66d7bec23439335118137f78c70306c</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="11.0.0-preview.4.26201.113">
<Dependency Name="System.CodeDom" Version="11.0.0-preview.4.26202.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</Sha>
<Sha>0d6cc667e66d7bec23439335118137f78c70306c</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="11.0.0-preview.4.26201.113">
<Dependency Name="System.Configuration.ConfigurationManager" Version="11.0.0-preview.4.26202.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</Sha>
<Sha>0d6cc667e66d7bec23439335118137f78c70306c</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="11.0.0-preview.4.26201.113">
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="11.0.0-preview.4.26202.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</Sha>
<Sha>0d6cc667e66d7bec23439335118137f78c70306c</Sha>
</Dependency>
<Dependency Name="System.Formats.Nrbf" Version="11.0.0-preview.4.26201.113">
<Dependency Name="System.Formats.Nrbf" Version="11.0.0-preview.4.26202.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</Sha>
<Sha>0d6cc667e66d7bec23439335118137f78c70306c</Sha>
</Dependency>
<Dependency Name="System.IO.Hashing" Version="11.0.0-preview.4.26201.113">
<Dependency Name="System.IO.Hashing" Version="11.0.0-preview.4.26202.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</Sha>
<Sha>0d6cc667e66d7bec23439335118137f78c70306c</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<!-- Arcade -->
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26201.113">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26202.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</Sha>
<Sha>0d6cc667e66d7bec23439335118137f78c70306c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="11.0.0-beta.26201.113">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="11.0.0-beta.26202.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</Sha>
<Sha>0d6cc667e66d7bec23439335118137f78c70306c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="11.0.0-beta.26201.113">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="11.0.0-beta.26202.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</Sha>
<Sha>0d6cc667e66d7bec23439335118137f78c70306c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26201.113">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26202.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</Sha>
<Sha>0d6cc667e66d7bec23439335118137f78c70306c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.26201.113">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.26202.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</Sha>
<Sha>0d6cc667e66d7bec23439335118137f78c70306c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.26201.113">
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.26202.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</Sha>
<Sha>0d6cc667e66d7bec23439335118137f78c70306c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26201.113">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26202.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>185a5cc19c0edff3dd2e0acdea9a182d9f077d36</Sha>
<Sha>0d6cc667e66d7bec23439335118137f78c70306c</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
8 changes: 4 additions & 4 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
"runner": "Microsoft.Testing.Platform"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26201.113",
"Microsoft.DotNet.CMake.Sdk": "11.0.0-beta.26201.113",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26201.113",
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26202.104",
"Microsoft.DotNet.CMake.Sdk": "11.0.0-beta.26202.104",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26202.104",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "11.0.0-preview.4.26201.113"
"Microsoft.NET.Sdk.IL": "11.0.0-preview.4.26202.104"
},
"native-tools": {
"cmake": "latest"
Expand Down
Loading