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.25555.103</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.25555.103</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.25555.103</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25555.103</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rc.1.25555.103</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25555.103</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25555.103</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rc.1.25555.103</MicrosoftPrivateWinformsPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25560.108</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.25560.108</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.25560.108</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25560.108</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rc.3.25560.108</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.3.25560.108</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.3.25560.108</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rc.3.25560.108</MicrosoftPrivateWinformsPackageVersion>
<MicrosoftSourceLinkAzureReposGitPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitPackageVersion>
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubPackageVersion>
<SystemCodeDomPackageVersion>10.0.0-rc.1.25555.103</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.1.25555.103</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>10.0.0-rc.1.25555.103</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesPackageVersion>10.0.0-rc.1.25555.103</SystemDirectoryServicesPackageVersion>
<SystemDrawingCommonPackageVersion>10.0.0-rc.1.25555.103</SystemDrawingCommonPackageVersion>
<SystemFormatsNrbfPackageVersion>10.0.0-rc.1.25555.103</SystemFormatsNrbfPackageVersion>
<SystemIOPackagingPackageVersion>10.0.0-rc.1.25555.103</SystemIOPackagingPackageVersion>
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rc.1.25555.103</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.1.25555.103</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.1.25555.103</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.1.25555.103</SystemRuntimeSerializationFormattersPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-rc.1.25555.103</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>10.0.0-rc.1.25555.103</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.1.25555.103</SystemWindowsExtensionsPackageVersion>
<SystemCodeDomPackageVersion>10.0.0-rc.3.25560.108</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.3.25560.108</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>10.0.0-rc.3.25560.108</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesPackageVersion>10.0.0-rc.3.25560.108</SystemDirectoryServicesPackageVersion>
<SystemDrawingCommonPackageVersion>10.0.0-rc.3.25560.108</SystemDrawingCommonPackageVersion>
<SystemFormatsNrbfPackageVersion>10.0.0-rc.3.25560.108</SystemFormatsNrbfPackageVersion>
<SystemIOPackagingPackageVersion>10.0.0-rc.3.25560.108</SystemIOPackagingPackageVersion>
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rc.3.25560.108</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.3.25560.108</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.3.25560.108</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.3.25560.108</SystemRuntimeSerializationFormattersPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-rc.3.25560.108</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>10.0.0-rc.3.25560.108</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.3.25560.108</SystemWindowsExtensionsPackageVersion>
<!-- _git/dotnet-wpf-int dependencies -->
<MicrosoftDotNetWpfDncEngPackageVersion>10.0.0-rc.1.25564.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="54c879632fdf0197d517d80e4b90861e2bd5d03e" BarId="289655" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="02022b2fe7037ef7a4af4b899c6d2c2353f94196" BarId="290335" />
<ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rc.1.25555.103">
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rc.3.25560.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>02022b2fe7037ef7a4af4b899c6d2c2353f94196</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rc.1.25555.103">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rc.3.25560.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>02022b2fe7037ef7a4af4b899c6d2c2353f94196</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.1.25555.103">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.3.25560.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>02022b2fe7037ef7a4af4b899c6d2c2353f94196</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.1.25555.103">
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.3.25560.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>02022b2fe7037ef7a4af4b899c6d2c2353f94196</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25555.103">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.3.25560.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>02022b2fe7037ef7a4af4b899c6d2c2353f94196</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.0-rc.1.25564.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
<Sha>19f30a08e6068715270bb020d584cfd88b4907ec</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.1.25555.103">
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.3.25560.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>02022b2fe7037ef7a4af4b899c6d2c2353f94196</Sha>
</Dependency>
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.1.25555.103">
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.3.25560.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>02022b2fe7037ef7a4af4b899c6d2c2353f94196</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25555.103">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.3.25560.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>02022b2fe7037ef7a4af4b899c6d2c2353f94196</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="10.0.0-rc.1.25555.103">
<Dependency Name="System.CodeDom" Version="10.0.0-rc.3.25560.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>02022b2fe7037ef7a4af4b899c6d2c2353f94196</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.1.25555.103">
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.3.25560.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>02022b2fe7037ef7a4af4b899c6d2c2353f94196</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-rc.1.25555.103">
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-rc.3.25560.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>02022b2fe7037ef7a4af4b899c6d2c2353f94196</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="10.0.0-rc.1.25555.103">
<Dependency Name="System.DirectoryServices" Version="10.0.0-rc.3.25560.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>02022b2fe7037ef7a4af4b899c6d2c2353f94196</Sha>
</Dependency>
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.1.25555.103">
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.3.25560.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>02022b2fe7037ef7a4af4b899c6d2c2353f94196</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="10.0.0-rc.1.25555.103">
<Dependency Name="System.IO.Packaging" Version="10.0.0-rc.3.25560.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>02022b2fe7037ef7a4af4b899c6d2c2353f94196</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-rc.1.25555.103">
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-rc.3.25560.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>02022b2fe7037ef7a4af4b899c6d2c2353f94196</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="10.0.0-rc.1.25555.103">
<Dependency Name="System.Security.Permissions" Version="10.0.0-rc.3.25560.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>02022b2fe7037ef7a4af4b899c6d2c2353f94196</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="10.0.0-rc.1.25555.103">
<Dependency Name="System.Drawing.Common" Version="10.0.0-rc.3.25560.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>02022b2fe7037ef7a4af4b899c6d2c2353f94196</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.25555.103">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25560.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>02022b2fe7037ef7a4af4b899c6d2c2353f94196</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="11.0.0-beta.25555.103">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="11.0.0-beta.25560.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>02022b2fe7037ef7a4af4b899c6d2c2353f94196</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25555.103">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25560.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>02022b2fe7037ef7a4af4b899c6d2c2353f94196</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.25555.103">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.25560.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>02022b2fe7037ef7a4af4b899c6d2c2353f94196</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.25555.103">
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rc.3.25560.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>02022b2fe7037ef7a4af4b899c6d2c2353f94196</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 @@ -6,7 +6,7 @@
<MinorVersion>0</MinorVersion>
<PatchVersion>0</PatchVersion>
<PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
<PreReleaseVersionIteration>3</PreReleaseVersionIteration>
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
<!--
Set assembly version to align with major and minor version, as for the patches and revisions should be manually
Expand Down
11 changes: 8 additions & 3 deletions eng/common/core-templates/job/publish-build-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ jobs:
/p:MaestroApiEndpoint=https://maestro.dot.net
/p:OfficialBuildId=$(OfficialBuildId)
-runtimeSourceFeed https://ci.dot.net/internal
-runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'

condition: ${{ parameters.condition }}
continueOnError: ${{ parameters.continueOnError }}
Expand Down Expand Up @@ -189,6 +189,11 @@ jobs:
BARBuildId: ${{ parameters.BARBuildId }}
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
is1ESPipeline: ${{ parameters.is1ESPipeline }}

# Darc is targeting 8.0, so make sure it's installed
- task: UseDotNet@2
inputs:
version: 8.0.x

- task: AzureCLI@2
displayName: Publish Using Darc
Expand All @@ -205,8 +210,8 @@ jobs:
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
-SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
-runtimeSourceFeed https://ci.dot.net/internal
-runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
-runtimeSourceFeed https://ci.dot.net/internal
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'

- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
- template: /eng/common/core-templates/steps/publish-logs.yml
Expand Down
6 changes: 5 additions & 1 deletion eng/common/core-templates/post-build/post-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,10 @@ stages:

- template: /eng/common/templates/steps/enable-internal-runtimes.yml

- task: UseDotNet@2
inputs:
version: 8.0.x

- task: AzureCLI@2
displayName: Publish Using Darc
inputs:
Expand All @@ -330,4 +334,4 @@ stages:
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
-SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
-runtimeSourceFeed https://ci.dot.net/internal
-runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
6 changes: 3 additions & 3 deletions eng/common/core-templates/steps/install-microbuild-impl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ parameters:
steps:
- ${{ if eq(parameters.enablePreviewMicrobuild, 'true') }}:
- task: MicroBuildSigningPluginPreview@4
displayName: Install Preview MicroBuild plugin (Windows)
displayName: Install Preview MicroBuild plugin
inputs: ${{ parameters.microbuildTaskInputs }}
env: ${{ parameters.microbuildEnv }}
continueOnError: ${{ parameters.continueOnError }}
condition: ${{ parameters.condition }}
- ${{ else }}:
- task: MicroBuildSigningPlugin@4
displayName: Install MicroBuild plugin (Windows)
displayName: Install MicroBuild plugin
inputs: ${{ parameters.microbuildTaskInputs }}
env: ${{ parameters.microbuildEnv }}
continueOnError: ${{ parameters.continueOnError }}
condition: ${{ parameters.condition }}
condition: ${{ parameters.condition }}
Loading