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
3 changes: 2 additions & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-0bcc3e6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-0bcc3e67/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-0bcc3e6-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-0bcc3e67-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-sdk -->
<!-- End: Package sources from dotnet-sdk -->
<add key="darc-pub-dotnet-sdk-81289841" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-sdk-81289841/nuget/v3/index.json" />
<add key="darc-pub-dotnet-sdk-81289841" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-sdk-81289841/nuget/v3/index.json" />
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<!--
'src/test/PrepareTestAssets/PrepareTestAssets.proj' generates a NuGet.config file using this
Expand Down
84 changes: 42 additions & 42 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -92,87 +92,87 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25325.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25366.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25325.4">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25366.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25325.4">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25366.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25325.4">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25366.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.25325.4">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.25366.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.25325.4">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.25366.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.0-beta.25325.4">
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.0-beta.25366.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25325.4">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25366.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.0-beta.25325.4">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.0-beta.25366.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.25325.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.25366.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.25325.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.25366.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25325.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25366.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25325.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25366.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.25325.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.25366.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.25325.4">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.25366.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.25325.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.25366.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.25325.4">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.25366.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.25325.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.25366.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.25325.4">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.25366.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.25325.4">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.25366.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.25313.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -332,9 +332,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>0827ec37403702d48974c727c09e579c6aa9748a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.25325.4">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.25366.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24462.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
32 changes: 16 additions & 16 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -85,22 +85,22 @@
<!-- SDK dependencies (also used in wasm build tests -->
<MicrosoftDotNetApiCompatTaskVersion>9.0.109</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.25325.4</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.25325.4</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.25325.4</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.25325.4</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.9.0-beta.25325.4</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25325.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.0-beta.25325.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25325.4</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25325.4</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.25325.4</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.25325.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25325.4</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.25325.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25325.4</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.25325.4</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.25325.4</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.25366.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.25366.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.25366.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.25366.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.9.0-beta.25366.1</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25366.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.0-beta.25366.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25366.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25366.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.25366.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.25366.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25366.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.25366.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25366.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.25366.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.25366.1</MicrosoftDotNetPackageTestingVersion>
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
<!-- NuGet dependencies -->
Expand Down
2 changes: 1 addition & 1 deletion eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =

# Locate Visual Studio installation or download x-copy msbuild.
$vsInfo = LocateVisualStudio $vsRequirements
if ($vsInfo -ne $null) {
if ($vsInfo -ne $null -and $env:ForceUseXCopyMSBuild -eq $null) {
# Ensure vsInstallDir has a trailing slash
$vsInstallDir = Join-Path $vsInfo.installationPath "\"
$vsMajorVersion = $vsInfo.installationVersion.Split('.')[0]
Expand Down
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"dotnet": "9.0.107"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25325.4",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25325.4",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25325.4",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25366.1",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25366.1",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25366.1",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "9.0.0-rtm.24511.16"
Expand Down
Loading