Skip to content

R
runtime

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

通知 1
Star 1
Fork 0
R
runtime

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 dfb685ad 编写于 作者: D dotnet-bot
浏览文件
操作

Merge in 'release/7.0' changes

上级 b8f82248 50f5fd03
隐藏空白更改
内联 并排
Showing with 61 addition and 59 deletion
NuGet.config
浏览文件 @ dfb685ad
......@@ -10,6 +10,8 @@
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-9b227c1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-9b227c16/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-9b227c1-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-9b227c16-2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-9b227c1-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-9b227c16-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<!--
......
eng/Version.Details.xml
浏览文件 @ dfb685ad
......@@ -58,77 +58,77 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23313.4">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.23179.6">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
......@@ -258,9 +258,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>0627fd5c5d3d1979e3a2234280e47c149c73333a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</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
浏览文件 @ dfb685ad
......@@ -53,22 +53,22 @@
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>7.0.100-rc.1.22402.1</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.23313.4</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.23313.4</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.23313.4</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.23313.4</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.23313.4</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23313.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23313.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.23313.4</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23313.4</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.23313.4</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.23313.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23313.4</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.23313.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.23313.4</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.23313.4</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.23313.4</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.23361.2</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.23361.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.23361.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.23361.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.23361.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23361.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23361.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.23361.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23361.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.23361.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.23361.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23361.2</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.23361.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.23361.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.23361.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.23361.2</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
......
global.json
浏览文件 @ dfb685ad
{
"sdk": {
"version": "7.0.107",
"version": "7.0.109",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "7.0.107"
"dotnet": "7.0.109"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23313.4",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23313.4",
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.23313.4",
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23361.2",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23361.2",
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.23361.2",
"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.
先完成此消息的编辑！
想要评论请 注册 或