Skip to content

R
runtime

dotNET Platform / runtime
11 个月 前同步成功

通知 1
Star 1
Fork 0
R
runtime

体验新版 GitCode，发现更多精彩内容 >>

未验证 提交 8023b492 编写于 作者: D dotnet-maestro[bot] 提交者： GitHub
浏览文件
操作

[main] Update dependencies from dotnet/arcade (#74495) 

* Update dependencies from https://github.com/dotnet/arcade build 20220823.2

Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 7.0.0-beta.22419.1 -> To Version 7.0.0-beta.22423.2

* Update dependencies from https://github.com/dotnet/arcade build 20220824.3

Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 7.0.0-beta.22419.1 -> To Version 7.0.0-beta.22424.3
Co-authored-by: Ndotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
上级 c112de11
隐藏空白更改
内联 并排
Showing with 59 addition and 59 deletion
eng/Version.Details.xml
浏览文件 @ 8023b492
......@@ -54,77 +54,77 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22419.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22424.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>34dff939b4a91e4693f78a856e0e055c1a3f3fba</Sha>
<Sha>258a37cd6a7884f771d0f991d9f24d29e292abd0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22419.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22424.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>34dff939b4a91e4693f78a856e0e055c1a3f3fba</Sha>
<Sha>258a37cd6a7884f771d0f991d9f24d29e292abd0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22419.1">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22424.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>34dff939b4a91e4693f78a856e0e055c1a3f3fba</Sha>
<Sha>258a37cd6a7884f771d0f991d9f24d29e292abd0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22419.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22424.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>34dff939b4a91e4693f78a856e0e055c1a3f3fba</Sha>
<Sha>258a37cd6a7884f771d0f991d9f24d29e292abd0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22419.1">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22424.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>34dff939b4a91e4693f78a856e0e055c1a3f3fba</Sha>
<Sha>258a37cd6a7884f771d0f991d9f24d29e292abd0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22419.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22424.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>34dff939b4a91e4693f78a856e0e055c1a3f3fba</Sha>
<Sha>258a37cd6a7884f771d0f991d9f24d29e292abd0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22419.1">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22424.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>34dff939b4a91e4693f78a856e0e055c1a3f3fba</Sha>
<Sha>258a37cd6a7884f771d0f991d9f24d29e292abd0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22419.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22424.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>34dff939b4a91e4693f78a856e0e055c1a3f3fba</Sha>
<Sha>258a37cd6a7884f771d0f991d9f24d29e292abd0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22419.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22424.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>34dff939b4a91e4693f78a856e0e055c1a3f3fba</Sha>
<Sha>258a37cd6a7884f771d0f991d9f24d29e292abd0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22419.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22424.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>34dff939b4a91e4693f78a856e0e055c1a3f3fba</Sha>
<Sha>258a37cd6a7884f771d0f991d9f24d29e292abd0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22419.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22424.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>34dff939b4a91e4693f78a856e0e055c1a3f3fba</Sha>
<Sha>258a37cd6a7884f771d0f991d9f24d29e292abd0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22419.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22424.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>34dff939b4a91e4693f78a856e0e055c1a3f3fba</Sha>
<Sha>258a37cd6a7884f771d0f991d9f24d29e292abd0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22419.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22424.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>34dff939b4a91e4693f78a856e0e055c1a3f3fba</Sha>
<Sha>258a37cd6a7884f771d0f991d9f24d29e292abd0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22419.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22424.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>34dff939b4a91e4693f78a856e0e055c1a3f3fba</Sha>
<Sha>258a37cd6a7884f771d0f991d9f24d29e292abd0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22419.1">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22424.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>34dff939b4a91e4693f78a856e0e055c1a3f3fba</Sha>
<Sha>258a37cd6a7884f771d0f991d9f24d29e292abd0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22419.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22424.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>34dff939b4a91e4693f78a856e0e055c1a3f3fba</Sha>
<Sha>258a37cd6a7884f771d0f991d9f24d29e292abd0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22419.1">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22424.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>34dff939b4a91e4693f78a856e0e055c1a3f3fba</Sha>
<Sha>258a37cd6a7884f771d0f991d9f24d29e292abd0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22419.1">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22424.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>34dff939b4a91e4693f78a856e0e055c1a3f3fba</Sha>
<Sha>258a37cd6a7884f771d0f991d9f24d29e292abd0</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.22409.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
......@@ -242,9 +242,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>5ebf69650b9f7b4ecab485be840b3022420f7812</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22419.1">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22424.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>34dff939b4a91e4693f78a856e0e055c1a3f3fba</Sha>
<Sha>258a37cd6a7884f771d0f991d9f24d29e292abd0</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
......
eng/Versions.props
浏览文件 @ 8023b492
......@@ -54,22 +54,22 @@
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>7.0.100-rc.1.22402.1</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22419.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22419.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22419.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.22419.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22419.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22419.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22419.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22419.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22419.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22419.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22419.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22419.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22419.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22419.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22419.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22419.1</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22424.3</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22424.3</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22424.3</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.22424.3</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22424.3</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22424.3</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22424.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22424.3</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22424.3</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22424.3</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22424.3</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22424.3</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22424.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22424.3</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22424.3</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22424.3</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
......
eng/common/generate-locproject.ps1
浏览文件 @ 8023b492
......@@ -62,7 +62,7 @@ $locJson = @{
$outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")"
$continue = $true
foreach ($exclusion in $exclusions.Exclusions) {
if ($outputPath.Contains($exclusion))
if ($_.FullName.Contains($exclusion))
{
$continue = $false
}
......@@ -98,7 +98,7 @@ $locJson = @{
$outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
$continue = $true
foreach ($exclusion in $exclusions.Exclusions) {
if ($outputPath.Contains($exclusion))
if ($_.FullName.Contains($exclusion))
{
$continue = $false
}
......
global.json
浏览文件 @ 8023b492
......@@ -8,9 +8,9 @@
"dotnet": "7.0.100-preview.7.22377.5"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22419.1",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22419.1",
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22419.1",
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22424.3",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22424.3",
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22424.3",
"Microsoft.Build.NoTargets": "3.5.0",
"Microsoft.Build.Traversal": "3.1.6",
"Microsoft.NET.Sdk.IL": "7.0.0-rc.1.22414.6"
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或