Skip to content

[main] Update dependencies from dotnet/dotnet #3663

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dotnet-maestro wants to merge 1 commit into
base: main
Choose a base branch
from
+149 −107
Open

[main] Update dependencies from dotnet/dotnet #3663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
96 changes: 48 additions & 48 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,103 +1,103 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26108.103">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26121.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8c56ff58fc59fd33fc1dab5c6a7155ca16511bb2</Sha>
<Sha>51587e2f3d5f86ca27184a6b5e8a778841d05b31</Sha>
</Dependency>
</ToolsetDependencies>
<ProductDependencies>
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="11.0.0-preview.2.26108.103">
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="11.0.0-preview.3.26121.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8c56ff58fc59fd33fc1dab5c6a7155ca16511bb2</Sha>
<Sha>51587e2f3d5f86ca27184a6b5e8a778841d05b31</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore" Version="11.0.0-preview.2.26108.103">
<Dependency Name="Microsoft.EntityFrameworkCore" Version="11.0.0-preview.3.26121.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8c56ff58fc59fd33fc1dab5c6a7155ca16511bb2</Sha>
<Sha>51587e2f3d5f86ca27184a6b5e8a778841d05b31</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="11.0.0-preview.2.26108.103">
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="11.0.0-preview.3.26121.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8c56ff58fc59fd33fc1dab5c6a7155ca16511bb2</Sha>
<Sha>51587e2f3d5f86ca27184a6b5e8a778841d05b31</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="11.0.0-preview.2.26108.103">
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="11.0.0-preview.3.26121.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8c56ff58fc59fd33fc1dab5c6a7155ca16511bb2</Sha>
<Sha>51587e2f3d5f86ca27184a6b5e8a778841d05b31</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.FileProviders.Physical" Version="11.0.0-preview.2.26108.103">
<Dependency Name="Microsoft.Extensions.FileProviders.Physical" Version="11.0.0-preview.3.26121.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8c56ff58fc59fd33fc1dab5c6a7155ca16511bb2</Sha>
<Sha>51587e2f3d5f86ca27184a6b5e8a778841d05b31</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Identity.Stores" Version="11.0.0-preview.2.26108.103">
<Dependency Name="Microsoft.Extensions.Identity.Stores" Version="11.0.0-preview.3.26121.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8c56ff58fc59fd33fc1dab5c6a7155ca16511bb2</Sha>
<Sha>51587e2f3d5f86ca27184a6b5e8a778841d05b31</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="11.0.0-preview.2.26108.103">
<Dependency Name="Microsoft.Extensions.Configuration" Version="11.0.0-preview.3.26121.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8c56ff58fc59fd33fc1dab5c6a7155ca16511bb2</Sha>
<Sha>51587e2f3d5f86ca27184a6b5e8a778841d05b31</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="11.0.0-preview.2.26108.103">
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="11.0.0-preview.3.26121.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8c56ff58fc59fd33fc1dab5c6a7155ca16511bb2</Sha>
<Sha>51587e2f3d5f86ca27184a6b5e8a778841d05b31</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="11.0.0-preview.2.26108.103">
<Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="11.0.0-preview.3.26121.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8c56ff58fc59fd33fc1dab5c6a7155ca16511bb2</Sha>
<Sha>51587e2f3d5f86ca27184a6b5e8a778841d05b31</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="11.0.0-preview.2.26108.103">
<Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="11.0.0-preview.3.26121.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8c56ff58fc59fd33fc1dab5c6a7155ca16511bb2</Sha>
<Sha>51587e2f3d5f86ca27184a6b5e8a778841d05b31</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="11.0.0-preview.2.26108.103">
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="11.0.0-preview.3.26121.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8c56ff58fc59fd33fc1dab5c6a7155ca16511bb2</Sha>
<Sha>51587e2f3d5f86ca27184a6b5e8a778841d05b31</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="11.0.0-preview.2.26108.103">
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="11.0.0-preview.3.26121.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8c56ff58fc59fd33fc1dab5c6a7155ca16511bb2</Sha>
<Sha>51587e2f3d5f86ca27184a6b5e8a778841d05b31</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="11.0.0-preview.2.26108.103">
<Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="11.0.0-preview.3.26121.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8c56ff58fc59fd33fc1dab5c6a7155ca16511bb2</Sha>
<Sha>51587e2f3d5f86ca27184a6b5e8a778841d05b31</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="11.0.0-preview.2.26108.103">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="11.0.0-preview.3.26121.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8c56ff58fc59fd33fc1dab5c6a7155ca16511bb2</Sha>
<Sha>51587e2f3d5f86ca27184a6b5e8a778841d05b31</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="11.0.0-preview.2.26108.103">
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="11.0.0-preview.3.26121.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8c56ff58fc59fd33fc1dab5c6a7155ca16511bb2</Sha>
<Sha>51587e2f3d5f86ca27184a6b5e8a778841d05b31</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="11.0.0-preview.2.26108.103">
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="11.0.0-preview.3.26121.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8c56ff58fc59fd33fc1dab5c6a7155ca16511bb2</Sha>
<Sha>51587e2f3d5f86ca27184a6b5e8a778841d05b31</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Debug" Version="11.0.0-preview.2.26108.103">
<Dependency Name="Microsoft.Extensions.Logging.Debug" Version="11.0.0-preview.3.26121.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8c56ff58fc59fd33fc1dab5c6a7155ca16511bb2</Sha>
<Sha>51587e2f3d5f86ca27184a6b5e8a778841d05b31</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="11.0.0-preview.2.26108.103">
<Dependency Name="Microsoft.Extensions.Logging" Version="11.0.0-preview.3.26121.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8c56ff58fc59fd33fc1dab5c6a7155ca16511bb2</Sha>
<Sha>51587e2f3d5f86ca27184a6b5e8a778841d05b31</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="11.0.0-preview.2.26108.103">
<Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="11.0.0-preview.3.26121.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8c56ff58fc59fd33fc1dab5c6a7155ca16511bb2</Sha>
<Sha>51587e2f3d5f86ca27184a6b5e8a778841d05b31</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="11.0.0-preview.2.26108.103">
<Dependency Name="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="11.0.0-preview.3.26121.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8c56ff58fc59fd33fc1dab5c6a7155ca16511bb2</Sha>
<Sha>51587e2f3d5f86ca27184a6b5e8a778841d05b31</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="11.0.0-preview.2.26108.103">
<Dependency Name="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="11.0.0-preview.3.26121.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8c56ff58fc59fd33fc1dab5c6a7155ca16511bb2</Sha>
<Sha>51587e2f3d5f86ca27184a6b5e8a778841d05b31</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Identity.UI" Version="11.0.0-preview.2.26108.103">
<Dependency Name="Microsoft.AspNetCore.Identity.UI" Version="11.0.0-preview.3.26121.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8c56ff58fc59fd33fc1dab5c6a7155ca16511bb2</Sha>
<Sha>51587e2f3d5f86ca27184a6b5e8a778841d05b31</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="11.0.0-preview.2.26108.103">
<Dependency Name="System.Text.Json" Version="11.0.0-preview.3.26121.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8c56ff58fc59fd33fc1dab5c6a7155ca16511bb2</Sha>
<Sha>51587e2f3d5f86ca27184a6b5e8a778841d05b31</Sha>
</Dependency>
</ProductDependencies>
</Dependencies>
46 changes: 23 additions & 23 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,55 +11,55 @@
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
<!-- Ref packages from darc subscriptions-->
<!-- Microsoft.EntityFrameworkCore.Design -->
<MicrosoftEntityFrameworkCoreDesignPackageVersion>11.0.0-preview.2.26108.103</MicrosoftEntityFrameworkCoreDesignPackageVersion>
<MicrosoftEntityFrameworkCoreDesignPackageVersion>11.0.0-preview.3.26121.104</MicrosoftEntityFrameworkCoreDesignPackageVersion>
<!-- Microsoft.EntityFrameworkCore -->
<MicrosoftEntityFrameworkCorePackageVersion>11.0.0-preview.2.26108.103</MicrosoftEntityFrameworkCorePackageVersion>
<MicrosoftEntityFrameworkCorePackageVersion>11.0.0-preview.3.26121.104</MicrosoftEntityFrameworkCorePackageVersion>
<!-- Microsoft.EntityFrameworkCore.SqlServer -->
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>11.0.0-preview.2.26108.103</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>11.0.0-preview.3.26121.104</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
<!-- Microsoft.Extensions.DependencyInjection -->
<MicrosoftExtensionsDependencyInjectionPackageVersion>11.0.0-preview.2.26108.103</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>11.0.0-preview.3.26121.104</MicrosoftExtensionsDependencyInjectionPackageVersion>
<!-- Microsoft.Extensions.FileProviders.Physical -->
<MicrosoftExtensionsFileProvidersPhysicalPackageVersion>11.0.0-preview.2.26108.103</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
<MicrosoftExtensionsFileProvidersPhysicalPackageVersion>11.0.0-preview.3.26121.104</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
<!-- Microsoft.Extensions.Identity.Stores -->
<MicrosoftExtensionsIdentityStoresPackageVersion>11.0.0-preview.2.26108.103</MicrosoftExtensionsIdentityStoresPackageVersion>
<MicrosoftExtensionsIdentityStoresPackageVersion>11.0.0-preview.3.26121.104</MicrosoftExtensionsIdentityStoresPackageVersion>
<!-- Microsoft.Extensions.Configuration.Abstractions -->
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>11.0.0-preview.2.26108.103</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>11.0.0-preview.3.26121.104</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<!-- Microsoft.Extensions.Configuration.EnvironmentVariables -->
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>11.0.0-preview.2.26108.103</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>11.0.0-preview.3.26121.104</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<!-- Microsoft.Extensions.Configuration.Json -->
<MicrosoftExtensionsConfigurationJsonPackageVersion>11.0.0-preview.2.26108.103</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>11.0.0-preview.3.26121.104</MicrosoftExtensionsConfigurationJsonPackageVersion>
<!-- Microsoft.Extensions.Configuration.Secrets -->
<MicrosoftExtensionsConfigurationUserSecretsPackageVersion>11.0.0-preview.2.26108.103</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
<MicrosoftExtensionsConfigurationUserSecretsPackageVersion>11.0.0-preview.3.26121.104</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
<!-- Microsoft.Extensions.DependencyModel -->
<MicrosoftExtensionsDependencyModelPackageVersion>11.0.0-preview.2.26108.103</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>11.0.0-preview.3.26121.104</MicrosoftExtensionsDependencyModelPackageVersion>
<!-- Microsoft.Extensions.FileProviders.Embedded -->
<MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>11.0.0-preview.2.26108.103</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
<MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>11.0.0-preview.3.26121.104</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
<!-- Microsoft.Extensions.Hosting -->
<MicrosoftExtensionsHostingPackageVersion>11.0.0-preview.1.26067.103</MicrosoftExtensionsHostingPackageVersion>
<!-- Microsoft.Extensions.Logging.Console -->
<MicrosoftExtensionsLoggingConsolePackageVersion>11.0.0-preview.2.26108.103</MicrosoftExtensionsLoggingConsolePackageVersion>
<MicrosoftExtensionsLoggingConsolePackageVersion>11.0.0-preview.3.26121.104</MicrosoftExtensionsLoggingConsolePackageVersion>
<!-- Microsoft.Extensions.Logging.Debug -->
<MicrosoftExtensionsLoggingDebugPackageVersion>11.0.0-preview.2.26108.103</MicrosoftExtensionsLoggingDebugPackageVersion>
<MicrosoftExtensionsLoggingDebugPackageVersion>11.0.0-preview.3.26121.104</MicrosoftExtensionsLoggingDebugPackageVersion>
<!-- Microsoft.Extensions.Logging -->
<MicrosoftExtensionsLoggingPackageVersion>11.0.0-preview.2.26108.103</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>11.0.0-preview.3.26121.104</MicrosoftExtensionsLoggingPackageVersion>
<!-- Microsoft.Extensions.Options.ConfigurationExtensions -->
<MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>11.0.0-preview.2.26108.103</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
<MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>11.0.0-preview.3.26121.104</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
<!-- Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore -->
<MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>11.0.0-preview.2.26108.103</MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>
<MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>11.0.0-preview.3.26121.104</MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>
<!-- Microsoft.AspNetCore.Identity.EntityFrameworkCore -->
<MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>11.0.0-preview.2.26108.103</MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>
<MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>11.0.0-preview.3.26121.104</MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>
<!-- Microsoft.AspNetCore.Identity.UI -->
<MicrosoftAspNetCoreIdentityUIPackageVersion>11.0.0-preview.2.26108.103</MicrosoftAspNetCoreIdentityUIPackageVersion>
<MicrosoftAspNetCoreIdentityUIPackageVersion>11.0.0-preview.3.26121.104</MicrosoftAspNetCoreIdentityUIPackageVersion>
<!-- Mono.TextTemplating-->
<MonoTextTemplatingVersion>3.0.0</MonoTextTemplatingVersion>
<!-- Microsoft.Extensions.Configuration -->
<MicrosoftExtensionsConfigurationPackageVersion>11.0.0-preview.2.26108.103</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>11.0.0-preview.3.26121.104</MicrosoftExtensionsConfigurationPackageVersion>
<!-- Microsoft.Extensions.Configuration.Binder -->
<MicrosoftExtensionsConfigurationBinderPackageVersion>11.0.0-preview.2.26108.103</MicrosoftExtensionsConfigurationBinderPackageVersion>
<MicrosoftExtensionsConfigurationBinderPackageVersion>11.0.0-preview.3.26121.104</MicrosoftExtensionsConfigurationBinderPackageVersion>
<!-- Microsoft.Extensions.Configuration.CommandLine -->
<MicrosoftExtensionsConfigurationCommandLinePackageVersion>11.0.0-preview.2.26108.103</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
<MicrosoftExtensionsConfigurationCommandLinePackageVersion>11.0.0-preview.3.26121.104</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
<!-- System.Text.Json -->
<SystemTextJsonPackageVersion>11.0.0-preview.2.26108.103</SystemTextJsonPackageVersion>
<SystemTextJsonPackageVersion>11.0.0-preview.3.26121.104</SystemTextJsonPackageVersion>
<SpectreConsoleFlowVersion>0.5.638</SpectreConsoleFlowVersion>
<SpectreConsoleVersion>0.47.0</SpectreConsoleVersion>
<MicrosoftCodeAnalysisPreviewVersion>5.0.0</MicrosoftCodeAnalysisPreviewVersion>
Expand Down
21 changes: 0 additions & 21 deletions eng/common/templates/steps/vmr-sync.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,27 +38,6 @@ steps:
displayName: Label PR commit
workingDirectory: $(Agent.BuildDirectory)/repo

- script: |
vmr_sha=$(grep -oP '(?<=Sha=")[^"]*' $(Agent.BuildDirectory)/repo/eng/Version.Details.xml)
echo "##vso[task.setvariable variable=vmr_sha]$vmr_sha"
displayName: Obtain the vmr sha from Version.Details.xml (Unix)
condition: ne(variables['Agent.OS'], 'Windows_NT')
workingDirectory: $(Agent.BuildDirectory)/repo

- powershell: |
[xml]$xml = Get-Content -Path $(Agent.BuildDirectory)/repo/eng/Version.Details.xml
$vmr_sha = $xml.SelectSingleNode("//Source").Sha
Write-Output "##vso[task.setvariable variable=vmr_sha]$vmr_sha"
displayName: Obtain the vmr sha from Version.Details.xml (Windows)
condition: eq(variables['Agent.OS'], 'Windows_NT')
workingDirectory: $(Agent.BuildDirectory)/repo

- script: |
git fetch --all
git checkout $(vmr_sha)
displayName: Checkout VMR at correct sha for repo flow
workingDirectory: ${{ parameters.vmrPath }}

- script: |
git config --global user.name "dotnet-maestro[bot]"
git config --global user.email "dotnet-maestro[bot]@users.noreply.github.com"
Expand Down
1 change: 1 addition & 0 deletions eng/common/templates/vmr-build-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ resources:
type: github
name: dotnet/dotnet
endpoint: dotnet
ref: refs/heads/main # Set to whatever VMR branch the PR build should insert into

stages:
- template: /eng/pipelines/templates/stages/vmr-build.yml@vmr
Expand Down
10 changes: 10 additions & 0 deletions eng/common/tools.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,11 @@ function LocateVisualStudio([object]$vsRequirements = $null){
return $null
}

if ($null -eq $vsInfo -or $vsInfo.Count -eq 0) {
throw "No instance of Visual Studio meeting the requirements specified was found. Requirements: $($args -join ' ')"
return $null
}

# use first matching instance
return $vsInfo[0]
}
Expand Down Expand Up @@ -820,6 +825,11 @@ function MSBuild-Core() {

$cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci"

# Add -mt flag for MSBuild multithreaded mode if enabled via environment variable
if ($env:MSBUILD_MT_ENABLED -eq "1") {
$cmdArgs += ' -mt'
}

if ($warnAsError) {
$cmdArgs += ' /warnaserror /p:TreatWarningsAsErrors=true'
}
Expand Down
Loading