Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/dotnet/llvm-project.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>2022-11-07 07:51:13 +0300
committerGitHub <noreply@github.com>2022-11-07 07:51:13 +0300
commite528bb7104ae6bcd36e81141f899d0229d99c5e5 (patch)
treeee1bdca0e0cb9fd11520c66b5e90708bfbf078b2
parent53ee4feddda1b216e8695047e4fb1f56238291e2 (diff)
[objwriter/release/7.0] Update dependencies from dotnet/arcade (#297)objwriter/release/7.0
* Update dependencies from https://github.com/dotnet/arcade build 20221013.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22507.2 -> To Version 7.0.0-beta.22513.4 * Update dependencies from https://github.com/dotnet/arcade build 20221014.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22507.2 -> To Version 7.0.0-beta.22514.3 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
-rw-r--r--eng/Version.Details.xml12
-rw-r--r--eng/Versions.props2
-rw-r--r--eng/common/sdk-task.ps12
-rw-r--r--eng/common/tools.ps14
-rw-r--r--global.json6
5 files changed, 13 insertions, 13 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 58ee616f02d8..c879dece0d9b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,17 +3,17 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
- <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22507.2">
+ <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22514.3">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>c4f77b4e80e942941e73d70cec045eddbfd7b4eb</Sha>
+ <Sha>3083cc93619dbb153fdb7907b332efa18908f039</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22507.2">
+ <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22514.3">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>c4f77b4e80e942941e73d70cec045eddbfd7b4eb</Sha>
+ <Sha>3083cc93619dbb153fdb7907b332efa18908f039</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22507.2">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22514.3">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>c4f77b4e80e942941e73d70cec045eddbfd7b4eb</Sha>
+ <Sha>3083cc93619dbb153fdb7907b332efa18908f039</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index be352ece2faa..084e4df1f9aa 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -6,6 +6,6 @@
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
</PropertyGroup>
<PropertyGroup>
- <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22507.2</MicrosoftDotNetBuildTasksPackagingVersion>
+ <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22514.3</MicrosoftDotNetBuildTasksPackagingVersion>
</PropertyGroup>
</Project>
diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1
index c35087a06019..39be08d4b16c 100644
--- a/eng/common/sdk-task.ps1
+++ b/eng/common/sdk-task.ps1
@@ -64,7 +64,7 @@ try {
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
}
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
- $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.2.1" -MemberType NoteProperty
+ $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.3.1" -MemberType NoteProperty
}
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index aba6308ad313..449126943299 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -365,8 +365,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
# If the version of msbuild is going to be xcopied,
# use this version. Version matches a package here:
- # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.2.1&view=overview
- $defaultXCopyMSBuildVersion = '17.2.1'
+ # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.3.1view=overview
+ $defaultXCopyMSBuildVersion = '17.3.1'
if (!$vsRequirements) {
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
diff --git a/global.json b/global.json
index 1ba1cd1ac7d4..9ad2b8b82271 100644
--- a/global.json
+++ b/global.json
@@ -1,10 +1,10 @@
{
"tools": {
- "dotnet": "7.0.100-rc.1.22431.12"
+ "dotnet": "7.0.100-rc.2.22477.23"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22507.2",
- "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22507.2",
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22514.3",
+ "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22514.3",
"Microsoft.Build.Traversal": "2.0.34"
}
}