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
98 changes: 49 additions & 49 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,106 +6,106 @@ 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="67889d9d2f21a890ac29bcd175c0d1937a401781" BarId="272656" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="7cd445ec6160e1edbe0c96caa5aa395822403d7f" BarId="273094" />
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.7.25320.118">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.7.25325.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
<Sha>7cd445ec6160e1edbe0c96caa5aa395822403d7f</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.7.25320.118">
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.7.25325.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
<Sha>7cd445ec6160e1edbe0c96caa5aa395822403d7f</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.7.25320.118">
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.7.25325.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
<Sha>7cd445ec6160e1edbe0c96caa5aa395822403d7f</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-preview.7.25320.118">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-preview.7.25325.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
<Sha>7cd445ec6160e1edbe0c96caa5aa395822403d7f</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-preview.7.25320.118">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-preview.7.25325.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
<Sha>7cd445ec6160e1edbe0c96caa5aa395822403d7f</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.7.25320.118">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.7.25325.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
<Sha>7cd445ec6160e1edbe0c96caa5aa395822403d7f</Sha>
</Dependency>
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.7.25320.118">
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.7.25325.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
<Sha>7cd445ec6160e1edbe0c96caa5aa395822403d7f</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.7.25320.118">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.7.25325.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
<Sha>7cd445ec6160e1edbe0c96caa5aa395822403d7f</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-preview.7.25320.118">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-preview.7.25325.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
<Sha>7cd445ec6160e1edbe0c96caa5aa395822403d7f</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.7.25320.118">
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.7.25325.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
<Sha>7cd445ec6160e1edbe0c96caa5aa395822403d7f</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="10.0.0-preview.7.25320.118">
<Dependency Name="System.Text.Json" Version="10.0.0-preview.7.25325.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
<Sha>7cd445ec6160e1edbe0c96caa5aa395822403d7f</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.7.25320.118">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.7.25325.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
<Sha>7cd445ec6160e1edbe0c96caa5aa395822403d7f</Sha>
</Dependency>
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.7.25320.118">
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.7.25325.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
<Sha>7cd445ec6160e1edbe0c96caa5aa395822403d7f</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-preview.7.25320.118">
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-preview.7.25325.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
<Sha>7cd445ec6160e1edbe0c96caa5aa395822403d7f</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="10.0.0-preview.7.25320.118">
<Dependency Name="System.CodeDom" Version="10.0.0-preview.7.25325.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
<Sha>7cd445ec6160e1edbe0c96caa5aa395822403d7f</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.7.25320.118">
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.7.25325.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
<Sha>7cd445ec6160e1edbe0c96caa5aa395822403d7f</Sha>
</Dependency>
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.7.25320.118">
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.7.25325.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
<Sha>7cd445ec6160e1edbe0c96caa5aa395822403d7f</Sha>
</Dependency>
<Dependency Name="System.IO.Hashing" Version="10.0.0-preview.7.25320.118">
<Dependency Name="System.IO.Hashing" Version="10.0.0-preview.7.25325.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
<Sha>7cd445ec6160e1edbe0c96caa5aa395822403d7f</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<!-- Arcade -->
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25320.118">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25325.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
<Sha>7cd445ec6160e1edbe0c96caa5aa395822403d7f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25320.118">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25325.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
<Sha>7cd445ec6160e1edbe0c96caa5aa395822403d7f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25320.118">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25325.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
<Sha>7cd445ec6160e1edbe0c96caa5aa395822403d7f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25320.118">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25325.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
<Sha>7cd445ec6160e1edbe0c96caa5aa395822403d7f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25320.118">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25325.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
<Sha>7cd445ec6160e1edbe0c96caa5aa395822403d7f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="10.0.0-beta.25320.118">
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="10.0.0-beta.25325.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>67889d9d2f21a890ac29bcd175c0d1937a401781</Sha>
<Sha>7cd445ec6160e1edbe0c96caa5aa395822403d7f</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
42 changes: 21 additions & 21 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,30 @@
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.7.25320.118</SystemReflectionMetadataLoadContextVersion>
<SystemTextEncodingsWebVersion>10.0.0-preview.7.25320.118</SystemTextEncodingsWebVersion>
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.7.25325.106</SystemReflectionMetadataLoadContextVersion>
<SystemTextEncodingsWebVersion>10.0.0-preview.7.25325.106</SystemTextEncodingsWebVersion>
</PropertyGroup>
<!-- Below have corresponding entries in Versions.Details.XML because they are updated via Maestro -->
<PropertyGroup>
<SystemFormatsNrbfPackageVersion>10.0.0-preview.7.25320.118</SystemFormatsNrbfPackageVersion>
<SystemIOHashingPackageVersion>10.0.0-preview.7.25320.118</SystemIOHashingPackageVersion>
<SystemFormatsNrbfPackageVersion>10.0.0-preview.7.25325.106</SystemFormatsNrbfPackageVersion>
<SystemIOHashingPackageVersion>10.0.0-preview.7.25325.106</SystemIOHashingPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>5.0.0-preview.7.20320.5</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-preview.7.25320.118</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-preview.7.25325.106</MicrosoftNETCoreILDAsmPackageVersion>
<SystemRuntimeCompilerServicesUnsafePackageVersion>6.1.0-preview.1.24511.1</SystemRuntimeCompilerServicesUnsafePackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.7.25320.118</SystemRuntimeSerializationFormattersPackageVersion>
<SystemTextJsonPackageVersion>10.0.0-preview.7.25320.118</SystemTextJsonPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.7.25320.118</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-preview.7.25320.118</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-preview.7.25320.118</MicrosoftWin32SystemEventsPackageVersion>
<SystemCodeDomPackageVersion>10.0.0-preview.7.25320.118</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.7.25320.118</SystemConfigurationConfigurationManagerPackageVersion>
<SystemResourcesExtensionsPackageVersion>10.0.0-preview.7.25320.118</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.7.25325.106</SystemRuntimeSerializationFormattersPackageVersion>
<SystemTextJsonPackageVersion>10.0.0-preview.7.25325.106</SystemTextJsonPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.7.25325.106</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-preview.7.25325.106</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-preview.7.25325.106</MicrosoftWin32SystemEventsPackageVersion>
<SystemCodeDomPackageVersion>10.0.0-preview.7.25325.106</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.7.25325.106</SystemConfigurationConfigurationManagerPackageVersion>
<SystemResourcesExtensionsPackageVersion>10.0.0-preview.7.25325.106</SystemResourcesExtensionsPackageVersion>
<SystemSecurityPermissionsPackageVersion>10.0.0-preview.5.25227.101</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.7.25320.118</SystemWindowsExtensionsPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.7.25320.118</MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.7.25320.118</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.7.25320.118</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETSdkILVersion>10.0.0-preview.7.25320.118</MicrosoftNETSdkILVersion>
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.7.25325.106</SystemWindowsExtensionsPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.7.25325.106</MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.7.25325.106</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.7.25325.106</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETSdkILVersion>10.0.0-preview.7.25325.106</MicrosoftNETSdkILVersion>
<!--
Microsoft.NET.Sdk.IL.targets requires definition of MicrosoftNETCoreILAsmVersion
-->
Expand All @@ -46,9 +46,9 @@
</PropertyGroup>
<!-- Arcade -->
<PropertyGroup>
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25320.118</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25320.118</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>10.0.0-beta.25320.118</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25325.106</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25325.106</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>10.0.0-beta.25325.106</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
</PropertyGroup>
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->
Expand Down
4 changes: 4 additions & 0 deletions eng/common/core-templates/steps/install-microbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ steps:
${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
azureSubscription: 'MicroBuild Signing Task (DevDiv)'
useEsrpCli: true
${{ elseif eq(variables['System.TeamProject'], 'DevDiv') }}:
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
${{ else }}:
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
env:
TeamName: $(_TeamName)
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
Expand Down
3 changes: 3 additions & 0 deletions eng/common/internal/NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,7 @@
<clear />
<add key="dotnet-core-internal-tooling" value="https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json" />
</packageSources>
<packageSourceMapping>
<clear />
</packageSourceMapping>
</configuration>
18 changes: 18 additions & 0 deletions eng/common/templates/vmr-build-pr.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
# This pipeline is used for running the VMR verification of the PR changes in repo-level PRs.
#
# It will run a full set of verification jobs defined in:
# https://github.com/dotnet/dotnet/blob/10060d128e3f470e77265f8490f5e4f72dae738e/eng/pipelines/templates/stages/vmr-build.yml#L27-L38
#
# For repos that do not need to run the full set, you would do the following:
#
# 1. Copy this YML file to a repo-specific location, i.e. outside of eng/common.
#
# 2. Add `verifications` parameter to VMR template reference
#
# Examples:
# - For source-build stage 1 verification, add the following:
# verifications: [ "source-build-stage1" ]
#
# - For Windows only verifications, add the following:
# verifications: [ "unified-build-windows-x64", "unified-build-windows-x86" ]

trigger: none
pr: none

Expand Down
8 changes: 4 additions & 4 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
"version": "10.0.100-preview.6.25315.102"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25320.118",
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25320.118",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25320.118",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25325.106",
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25325.106",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25325.106",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "10.0.0-preview.7.25320.118"
"Microsoft.NET.Sdk.IL": "10.0.0-preview.7.25325.106"
},
"native-tools": {
"cmake": "latest"
Expand Down