Просмотр исходного кода

Merge commit '553d4e88078b9ca3bf60fee596e171782eb1b957'

Mirroring 3 месяцев назад
Родитель
Сommit
b632b13ba3
4 измененных файлов с 7 добавлено и 55 удалено
  1. 0 48
      .azure/pipelines/signalr-daily-tests.yml
  2. 4 4
      eng/Version.Details.xml
  3. 2 2
      eng/Versions.props
  4. 1 1
      src/submodules/googletest

+ 0 - 48
.azure/pipelines/signalr-daily-tests.yml

@@ -1,48 +0,0 @@
-# Uses Scheduled Triggers, which aren't supported in YAML yet.
-# https://learn.microsoft.com/azure/devops/pipelines/build/triggers?view=vsts&tabs=yaml#scheduled
-
-# Daily Tests for ASP.NET Core SignalR
-# These use Sauce Labs resources, hence they run daily rather than per-commit.
-
-variables:
-  - ${{ if ne(variables['System.TeamProject'], 'public') }}:
-    - group: AzureDevOps-Artifact-Feeds-Pats
-  - template: /eng/common/templates-official/variables/pool-providers.yml@self
-
-resources:
-  repositories:
-  # Repo: 1ESPipelineTemplates/1ESPipelineTemplates
-  - repository: 1esPipelines
-    type: git
-    name: 1ESPipelineTemplates/1ESPipelineTemplates
-    ref: refs/tags/release
-
-extends:
-  template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
-  parameters:
-    sdl:
-      sourceAnalysisPool:
-        name: NetCore1ESPool-Svc-Internal
-        image: 1es-windows-2022
-        os: windows
-      codeql:
-        compiled:
-          enabled: false
-          justificationForDisabling: 'This is a test-only pipeline. The same product code is already scanned in the main pipeline (aspnetcore-ci)'
-    stages:
-    - stage: build
-      displayName: Build
-      # The only Daily Tests we have run in Sauce Labs and only need to run on one machine (because they just trigger SauceLabs)
-      # Hence we use the 'default-build.yml' template because it represents a single phase
-      jobs:
-      - template: .azure/pipelines/jobs/default-build.yml@self
-        parameters:
-          buildDirectory: src/SignalR
-          buildArgs: "/p:DailyTests=true /p:SauceUser='$(asplab-sauce-labs-username)' /p:SauceKey='$(asplab-sauce-labs-access-key)' -t"
-          agentOs: Windows
-          jobName: SignalRDailyTests
-          jobDisplayName: "SignalR Daily Tests"
-          artifacts:
-          - name: Windows_Logs
-            path: artifacts/log/
-            publishOnError: true

+ 4 - 4
eng/Version.Details.xml

@@ -414,13 +414,13 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>6e2d8e204cebac7d3989c1996f96e5a9ed63fa80</Sha>
       <Sha>6e2d8e204cebac7d3989c1996f96e5a9ed63fa80</Sha>
     </Dependency>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="10.0.0-preview.1.25565.1">
+    <Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="10.1.0-preview.1.25578.1">
       <Uri>https://github.com/dotnet/extensions</Uri>
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>edf9088ebb507658c60e964ebd5548421c5dbaea</Sha>
+      <Sha>28fb38d947aeeae3b75f037e20ba3b194413f2c6</Sha>
     </Dependency>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="10.0.0-preview.1.25565.1">
+    <Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="10.1.0-preview.1.25578.1">
       <Uri>https://github.com/dotnet/extensions</Uri>
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>edf9088ebb507658c60e964ebd5548421c5dbaea</Sha>
+      <Sha>28fb38d947aeeae3b75f037e20ba3b194413f2c6</Sha>
     </Dependency>
     </Dependency>
     <Dependency Name="NuGet.Frameworks" Version="6.2.4">
     <Dependency Name="NuGet.Frameworks" Version="6.2.4">
       <Uri>https://github.com/nuget/nuget.client</Uri>
       <Uri>https://github.com/nuget/nuget.client</Uri>

+ 2 - 2
eng/Versions.props

@@ -143,8 +143,8 @@
     <SystemIOHashingVersion>9.0.12</SystemIOHashingVersion>
     <SystemIOHashingVersion>9.0.12</SystemIOHashingVersion>
     <SystemRuntimeCachingVersion>9.0.12</SystemRuntimeCachingVersion>
     <SystemRuntimeCachingVersion>9.0.12</SystemRuntimeCachingVersion>
     <!-- Packages from dotnet/extensions -->
     <!-- Packages from dotnet/extensions -->
-    <MicrosoftExtensionsDiagnosticsTestingVersion>10.0.0-preview.1.25565.1</MicrosoftExtensionsDiagnosticsTestingVersion>
-    <MicrosoftExtensionsTimeProviderTestingVersion>10.0.0-preview.1.25565.1</MicrosoftExtensionsTimeProviderTestingVersion>
+    <MicrosoftExtensionsDiagnosticsTestingVersion>10.1.0-preview.1.25578.1</MicrosoftExtensionsDiagnosticsTestingVersion>
+    <MicrosoftExtensionsTimeProviderTestingVersion>10.1.0-preview.1.25578.1</MicrosoftExtensionsTimeProviderTestingVersion>
     <!-- Packages from dotnet/efcore -->
     <!-- Packages from dotnet/efcore -->
     <dotnetefVersion>9.0.12</dotnetefVersion>
     <dotnetefVersion>9.0.12</dotnetefVersion>
     <MicrosoftEntityFrameworkCoreInMemoryVersion>9.0.12</MicrosoftEntityFrameworkCoreInMemoryVersion>
     <MicrosoftEntityFrameworkCoreInMemoryVersion>9.0.12</MicrosoftEntityFrameworkCoreInMemoryVersion>

+ 1 - 1
src/submodules/googletest

@@ -1 +1 @@
-Subproject commit 6ec14dfd8c409d05fba94e18e3a02df35b874353
+Subproject commit 1b96fa13f549387b7549cc89e1a785cf143a1a50