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

github.com/mono/linker.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>2022-10-10 15:31:29 +0300
committerdotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>2022-10-10 15:31:29 +0300
commit00b6379a5225d64948b9273e81e76de0fc47cf06 (patch)
tree7ed1e6f4026e7e7cb47ac080a0d8576002373aca
parent7fb4c7a46b3b58389c80985149b1f6dd91787696 (diff)
Update dependencies from https://github.com/dotnet/arcade build 20221003.6darc-release/6.0.x-5af5129a-16b9-42a9-ae3a-ac546c7a740c
Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22166.2 -> To Version 6.0.0-beta.22503.6
-rw-r--r--eng/Version.Details.xml8
-rw-r--r--eng/Versions.props2
-rw-r--r--eng/common/init-tools-native.ps11
-rw-r--r--global.json2
4 files changed, 7 insertions, 6 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index c62d56b37..c0cdf5eb7 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,14 +3,14 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
- <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22473.2">
+ <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22503.6">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>60c99c0e23b188aa500d0cc10dd0f777b53068fb</Sha>
+ <Sha>5d4b2b8d6e6bae36a7c07ab6c3a2e9cc6f92f243</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
- <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.22473.2">
+ <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.22503.6">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>60c99c0e23b188aa500d0cc10dd0f777b53068fb</Sha>
+ <Sha>5d4b2b8d6e6bae36a7c07ab6c3a2e9cc6f92f243</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="7.0.0-alpha.1.21524.4">
<Uri>https://github.com/dotnet/runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index a746fe546..86acdb6ef 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -18,7 +18,7 @@
<SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
<MicrosoftBuildFrameworkVersion>17.0.0-preview-21267-01</MicrosoftBuildFrameworkVersion>
<MicrosoftBuildUtilitiesCoreVersion>17.0.0-preview-21267-01</MicrosoftBuildUtilitiesCoreVersion>
- <MicrosoftDotNetApiCompatVersion>6.0.0-beta.22473.2</MicrosoftDotNetApiCompatVersion>
+ <MicrosoftDotNetApiCompatVersion>6.0.0-beta.22503.6</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21271.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftCodeAnalysisCSharpCodeStyleVersion>3.10.0-2.final</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
<MicrosoftCodeAnalysisVersion>3.10.0-2.final</MicrosoftCodeAnalysisVersion>
diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1
index 7428ef880..6c7a851a8 100644
--- a/eng/common/init-tools-native.ps1
+++ b/eng/common/init-tools-native.ps1
@@ -112,6 +112,7 @@ try {
$ToolPath = Convert-Path -Path $BinPath
Write-Host "Adding $ToolName to the path ($ToolPath)..."
Write-Host "##vso[task.prependpath]$ToolPath"
+ $env:PATH = "$ToolPath;$env:PATH"
$InstalledTools += @{ $ToolName = $ToolDirectory.FullName }
}
}
diff --git a/global.json b/global.json
index 433fb09b7..8cabc549c 100644
--- a/global.json
+++ b/global.json
@@ -3,7 +3,7 @@
"dotnet": "6.0.109"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22473.2",
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22503.6",
"Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.21524.4"
}