Skip to content
Merged
74 changes: 37 additions & 37 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,80 +1,80 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="699b0116eb3df66c4dd7698af4f1cd24ac4547a3" BarId="275638" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="19deb21964f2c9465b5e5c45e923c32559c7f852" BarId="276280" />
<ProductDependencies>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.7.25367.101">
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.7.25372.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
<Sha>19deb21964f2c9465b5e5c45e923c32559c7f852</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-preview.7.25367.101">
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-preview.7.25372.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
<Sha>19deb21964f2c9465b5e5c45e923c32559c7f852</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-preview.7.25367.101">
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-preview.7.25372.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
<Sha>19deb21964f2c9465b5e5c45e923c32559c7f852</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.7.25367.101">
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.7.25372.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
<Sha>19deb21964f2c9465b5e5c45e923c32559c7f852</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-preview.7.25367.101">
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-preview.7.25372.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
<Sha>19deb21964f2c9465b5e5c45e923c32559c7f852</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.7.25367.101">
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.7.25372.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
<Sha>19deb21964f2c9465b5e5c45e923c32559c7f852</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-preview.7.25367.101">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-preview.7.25372.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
<Sha>19deb21964f2c9465b5e5c45e923c32559c7f852</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-preview.7.25367.101">
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-preview.7.25372.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
<Sha>19deb21964f2c9465b5e5c45e923c32559c7f852</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-preview.7.25367.101">
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-preview.7.25372.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
<Sha>19deb21964f2c9465b5e5c45e923c32559c7f852</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.7.25367.101">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.7.25372.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
<Sha>19deb21964f2c9465b5e5c45e923c32559c7f852</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.7.25367.101">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.7.25372.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
<Sha>19deb21964f2c9465b5e5c45e923c32559c7f852</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="10.0.0-preview.7.25367.101">
<Dependency Name="System.Text.Json" Version="10.0.0-preview.7.25372.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
<Sha>19deb21964f2c9465b5e5c45e923c32559c7f852</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.7.25367.101">
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.7.25372.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
<Sha>19deb21964f2c9465b5e5c45e923c32559c7f852</Sha>
</Dependency>
<Dependency Name="System.Formats.Asn1" Version="10.0.0-preview.7.25367.101">
<Dependency Name="System.Formats.Asn1" Version="10.0.0-preview.7.25372.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
<Sha>19deb21964f2c9465b5e5c45e923c32559c7f852</Sha>
</Dependency>
<Dependency Name="System.Runtime.Caching" Version="10.0.0-preview.7.25367.101">
<Dependency Name="System.Runtime.Caching" Version="10.0.0-preview.7.25372.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
<Sha>19deb21964f2c9465b5e5c45e923c32559c7f852</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25367.101">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25372.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
<Sha>19deb21964f2c9465b5e5c45e923c32559c7f852</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25367.101">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25372.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
<Sha>19deb21964f2c9465b5e5c45e923c32559c7f852</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25367.101">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25372.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
<Sha>19deb21964f2c9465b5e5c45e923c32559c7f852</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
32 changes: 16 additions & 16 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,24 @@
<UsingToolXliff>False</UsingToolXliff>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/runtime">
<MicrosoftExtensionsCachingMemoryVersion>10.0.0-preview.7.25367.101</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.7.25367.101</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.7.25367.101</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>10.0.0-preview.7.25367.101</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.7.25367.101</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.7.25367.101</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyModelVersion>10.0.0-preview.7.25367.101</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>10.0.0-preview.7.25367.101</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.7.25367.101</MicrosoftExtensionsLoggingVersion>
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.7.25367.101</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.7.25367.101</MicrosoftNETCorePlatformsVersion>
<SystemTextEncodingsWebVersion>10.0.0-preview.7.25367.101</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>10.0.0-preview.7.25367.101</SystemTextJsonVersion>
<SystemFormatsAsn1Version>10.0.0-preview.7.25367.101</SystemFormatsAsn1Version>
<SystemRuntimeCachingVersion>10.0.0-preview.7.25367.101</SystemRuntimeCachingVersion>
<MicrosoftExtensionsCachingMemoryVersion>10.0.0-preview.7.25372.102</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.7.25372.102</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.7.25372.102</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>10.0.0-preview.7.25372.102</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.7.25372.102</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.7.25372.102</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyModelVersion>10.0.0-preview.7.25372.102</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>10.0.0-preview.7.25372.102</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.7.25372.102</MicrosoftExtensionsLoggingVersion>
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.7.25372.102</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.7.25372.102</MicrosoftNETCorePlatformsVersion>
<SystemTextEncodingsWebVersion>10.0.0-preview.7.25372.102</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>10.0.0-preview.7.25372.102</SystemTextJsonVersion>
<SystemFormatsAsn1Version>10.0.0-preview.7.25372.102</SystemFormatsAsn1Version>
<SystemRuntimeCachingVersion>10.0.0-preview.7.25372.102</SystemRuntimeCachingVersion>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/arcade">
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25367.101</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25372.102</MicrosoftDotNetBuildTasksTemplatingVersion>
</PropertyGroup>
<PropertyGroup Label="Other dependencies">
<MicrosoftBuildFrameworkVersion>17.14.8</MicrosoftBuildFrameworkVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,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
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25367.101",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25367.101"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25372.102",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25372.102"
}
}
Loading