Skip to content

R
runtime

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

通知 1
Star 1
Fork 0
R
runtime

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

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

Merge in 'release/7.0' changes

上级 f0bc9576 97214040
隐藏空白更改
内联 并排
Showing with 87 addition and 81 deletion
.config/dotnet-tools.json
浏览文件 @ 8e9a17b2
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
] ]
}, },
"microsoft.dotnet.xharness.cli": { "microsoft.dotnet.xharness.cli": {
"version": "7.0.0-prerelease.23253.3", "version": "7.0.0-prerelease.23309.1",
"commands": [ "commands": [
"xharness" "xharness"
] ]
......
NuGet.config
浏览文件 @ 8e9a17b2
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<clear /> <clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-emsdk --> <!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-fbdbcaf" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-fbdbcaf6/nuget/v3/index.json" /> <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" />
<!-- End: Package sources from dotnet-emsdk --> <!-- End: Package sources from dotnet-emsdk -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<!-- <!--
......
eng/Version.Details.xml
浏览文件 @ 8e9a17b2
...@@ -48,87 +48,87 @@ ...@@ -48,87 +48,87 @@
<Uri>https://github.com/dotnet/command-line-api</Uri> <Uri>https://github.com/dotnet/command-line-api</Uri>
<Sha>5618b2d243ccdeb5c7e50a298b33b13036b4351b</Sha> <Sha>5618b2d243ccdeb5c7e50a298b33b13036b4351b</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.8"> <Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.9">
<Uri>https://github.com/dotnet/emsdk</Uri> <Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>fbdbcaf65a6eebd0d87bb3b6839aafc82375fbf0</Sha> <Sha>9b227c1606a01920839873f840f6b76f7b492a66</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.8"> <Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.9">
<Uri>https://github.com/dotnet/emsdk</Uri> <Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>fbdbcaf65a6eebd0d87bb3b6839aafc82375fbf0</Sha> <Sha>9b227c1606a01920839873f840f6b76f7b492a66</Sha>
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23228.7"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha> <Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23228.7"> <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha> <Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.23228.7"> <Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha> <Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.23228.7"> <Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha> <Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.23228.7"> <Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha> <Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23228.7"> <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha> <Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23228.7"> <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha> <Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.23228.7"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha> <Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.23228.7"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha> <Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23228.7"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha> <Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23228.7"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha> <Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.23228.7"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha> <Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.23228.7"> <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha> <Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.23228.7"> <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha> <Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.23228.7"> <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha> <Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23228.7"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha> <Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.23228.7"> <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha> <Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.23228.7"> <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha> <Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency> </Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.23179.6"> <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.23179.6">
<Uri>https://github.com/dotnet/runtime-assets</Uri> <Uri>https://github.com/dotnet/runtime-assets</Uri>
...@@ -246,21 +246,21 @@ ...@@ -246,21 +246,21 @@
<Uri>https://github.com/dotnet/linker</Uri> <Uri>https://github.com/dotnet/linker</Uri>
<Sha>9d4b3f3e0c100fe5ac4dc7f40d14d792178dbd0c</Sha> <Sha>9d4b3f3e0c100fe5ac4dc7f40d14d792178dbd0c</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="7.0.0-prerelease.23253.3"> <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="7.0.0-prerelease.23309.1">
<Uri>https://github.com/dotnet/xharness</Uri> <Uri>https://github.com/dotnet/xharness</Uri>
<Sha>2105520c1f824406b7738d715ad132bbd42a6d6b</Sha> <Sha>0627fd5c5d3d1979e3a2234280e47c149c73333a</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="7.0.0-prerelease.23253.3"> <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="7.0.0-prerelease.23309.1">
<Uri>https://github.com/dotnet/xharness</Uri> <Uri>https://github.com/dotnet/xharness</Uri>
<Sha>2105520c1f824406b7738d715ad132bbd42a6d6b</Sha> <Sha>0627fd5c5d3d1979e3a2234280e47c149c73333a</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="7.0.0-prerelease.23253.3"> <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="7.0.0-prerelease.23309.1">
<Uri>https://github.com/dotnet/xharness</Uri> <Uri>https://github.com/dotnet/xharness</Uri>
<Sha>2105520c1f824406b7738d715ad132bbd42a6d6b</Sha> <Sha>0627fd5c5d3d1979e3a2234280e47c149c73333a</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.23228.7"> <Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha> <Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency> </Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6"> <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> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
......
eng/Versions.props
浏览文件 @ 8e9a17b2
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
<UsingToolIbcOptimization>false</UsingToolIbcOptimization> <UsingToolIbcOptimization>false</UsingToolIbcOptimization>
<UsingToolXliff>false</UsingToolXliff> <UsingToolXliff>false</UsingToolXliff>
<LastReleasedStableAssemblyVersion>$(AssemblyVersion)</LastReleasedStableAssemblyVersion> <LastReleasedStableAssemblyVersion>$(AssemblyVersion)</LastReleasedStableAssemblyVersion>
<MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.8</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version> <MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.9</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>
<MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.8</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version> <MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.9</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<!-- The bands we want to produce workload manifests for --> <!-- The bands we want to produce workload manifests for -->
...@@ -53,22 +53,22 @@ ...@@ -53,22 +53,22 @@
<!-- SDK dependencies --> <!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>7.0.100-rc.1.22402.1</MicrosoftDotNetApiCompatTaskVersion> <MicrosoftDotNetApiCompatTaskVersion>7.0.100-rc.1.22402.1</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies --> <!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.23228.7</MicrosoftDotNetApiCompatVersion> <MicrosoftDotNetApiCompatVersion>7.0.0-beta.23313.4</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.23228.7</MicrosoftDotNetBuildTasksFeedVersion> <MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.23313.4</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.23228.7</MicrosoftDotNetCodeAnalysisVersion> <MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.23313.4</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.23228.7</MicrosoftDotNetGenAPIVersion> <MicrosoftDotNetGenAPIVersion>7.0.0-beta.23313.4</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.23228.7</MicrosoftDotNetGenFacadesVersion> <MicrosoftDotNetGenFacadesVersion>7.0.0-beta.23313.4</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23228.7</MicrosoftDotNetXUnitExtensionsVersion> <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23313.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23228.7</MicrosoftDotNetXUnitConsoleRunnerVersion> <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23313.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.23228.7</MicrosoftDotNetBuildTasksArchivesVersion> <MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.23313.4</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23228.7</MicrosoftDotNetBuildTasksInstallersVersion> <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23313.4</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.23228.7</MicrosoftDotNetBuildTasksPackagingVersion> <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.23313.4</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.23228.7</MicrosoftDotNetBuildTasksTargetFrameworkVersion> <MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.23313.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23228.7</MicrosoftDotNetBuildTasksTemplatingVersion> <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23313.4</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.23228.7</MicrosoftDotNetBuildTasksWorkloadsPackageVersion> <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.23313.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.23228.7</MicrosoftDotNetRemoteExecutorVersion> <MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.23313.4</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.23228.7</MicrosoftDotNetVersionToolsTasksVersion> <MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.23313.4</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.23228.7</MicrosoftDotNetPackageTestingVersion> <MicrosoftDotNetPackageTestingVersion>7.0.0-beta.23313.4</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies --> <!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion> <NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies --> <!-- Installer dependencies -->
...@@ -154,9 +154,9 @@ ...@@ -154,9 +154,9 @@
<!-- Testing --> <!-- Testing -->
<MicrosoftNETCoreCoreDisToolsVersion>1.1.0</MicrosoftNETCoreCoreDisToolsVersion> <MicrosoftNETCoreCoreDisToolsVersion>1.1.0</MicrosoftNETCoreCoreDisToolsVersion>
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion> <MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>7.0.0-prerelease.23253.3</MicrosoftDotNetXHarnessTestRunnersCommonVersion> <MicrosoftDotNetXHarnessTestRunnersCommonVersion>7.0.0-prerelease.23309.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>7.0.0-prerelease.23253.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion> <MicrosoftDotNetXHarnessTestRunnersXunitVersion>7.0.0-prerelease.23309.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>7.0.0-prerelease.23253.3</MicrosoftDotNetXHarnessCLIVersion> <MicrosoftDotNetXHarnessCLIVersion>7.0.0-prerelease.23309.1</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>7.0.0-alpha.0.23226.5</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion> <MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>7.0.0-alpha.0.23226.5</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<XUnitVersion>2.4.2</XUnitVersion> <XUnitVersion>2.4.2</XUnitVersion>
<XUnitAnalyzersVersion>1.0.0</XUnitAnalyzersVersion> <XUnitAnalyzersVersion>1.0.0</XUnitAnalyzersVersion>
......
eng/common/templates/job/job.yml
浏览文件 @ 8e9a17b2
...@@ -73,6 +73,10 @@ jobs: ...@@ -73,6 +73,10 @@ jobs:
- ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}: - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}:
- name: EnableRichCodeNavigation - name: EnableRichCodeNavigation
value: 'true' value: 'true'
# Retry signature validation up to three times, waiting 2 seconds between attempts.
# See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures
- name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY
value: 3,2000
- ${{ each variable in parameters.variables }}: - ${{ each variable in parameters.variables }}:
# handle name-value variable syntax # handle name-value variable syntax
# example: # example:
...@@ -81,7 +85,7 @@ jobs: ...@@ -81,7 +85,7 @@ jobs:
- ${{ if ne(variable.name, '') }}: - ${{ if ne(variable.name, '') }}:
- name: ${{ variable.name }} - name: ${{ variable.name }}
value: ${{ variable.value }} value: ${{ variable.value }}
# handle variable groups # handle variable groups
- ${{ if ne(variable.group, '') }}: - ${{ if ne(variable.group, '') }}:
- group: ${{ variable.group }} - group: ${{ variable.group }}
...@@ -145,15 +149,17 @@ jobs: ...@@ -145,15 +149,17 @@ jobs:
- template: /eng/common/templates/steps/component-governance.yml - template: /eng/common/templates/steps/component-governance.yml
parameters: parameters:
${{ if eq(parameters.disableComponentGovernance, '') }}: ${{ if eq(parameters.disableComponentGovernance, '') }}:
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(contains(variables['Build.SourceBranch'], 'internal/release'), eq(variables['Build.SourceBranch'], 'main'))) }}: ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}:
disableComponentGovernance: false disableComponentGovernance: false
${{ else }}: ${{ else }}:
disableComponentGovernance: true disableComponentGovernance: true
${{ else }}:
disableComponentGovernance: ${{ parameters.disableComponentGovernance }}
- ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- task: MicroBuildCleanup@1 - task: MicroBuildCleanup@1
displayName: Execute Microbuild cleanup tasks displayName: Execute Microbuild cleanup tasks
condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
continueOnError: ${{ parameters.continueOnError }} continueOnError: ${{ parameters.continueOnError }}
env: env:
...@@ -221,7 +227,7 @@ jobs: ...@@ -221,7 +227,7 @@ jobs:
displayName: Publish XUnit Test Results displayName: Publish XUnit Test Results
inputs: inputs:
testResultsFormat: 'xUnit' testResultsFormat: 'xUnit'
testResultsFiles: '*.xml' testResultsFiles: '*.xml'
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
mergeTestResults: ${{ parameters.mergeTestResults }} mergeTestResults: ${{ parameters.mergeTestResults }}
...@@ -232,7 +238,7 @@ jobs: ...@@ -232,7 +238,7 @@ jobs:
displayName: Publish TRX Test Results displayName: Publish TRX Test Results
inputs: inputs:
testResultsFormat: 'VSTest' testResultsFormat: 'VSTest'
testResultsFiles: '*.trx' testResultsFiles: '*.trx'
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
mergeTestResults: ${{ parameters.mergeTestResults }} mergeTestResults: ${{ parameters.mergeTestResults }}
......
global.json
浏览文件 @ 8e9a17b2
{ {
"sdk": { "sdk": {
"version": "7.0.105", "version": "7.0.107",
"allowPrerelease": true, "allowPrerelease": true,
"rollForward": "major" "rollForward": "major"
}, },
"tools": { "tools": {
"dotnet": "7.0.105" "dotnet": "7.0.107"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23228.7", "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23313.4",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23228.7", "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23313.4",
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.23228.7", "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.23313.4",
"Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.NoTargets": "3.5.0",
"Microsoft.Build.Traversal": "3.1.6", "Microsoft.Build.Traversal": "3.1.6",
"Microsoft.NET.Sdk.IL": "7.0.0-rc.1.22414.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.
先完成此消息的编辑！
想要评论请 注册 或