Merge remote-tracking branch 'upstream/main' into remove-storage-key-tests

Author: mmitche

.vault-config/dotneteng-status-local.yaml

@@ -24,12 +24,3 @@ secrets:
     parameters:
       environment: dotnet-eng-grafana-staging.westus2.cloudapp.azure.com
 
-  nethelix-engsrv-kusto-connection-string-ingest:
-    type: kusto-connection-string
-    parameters:
-      adApplication:
-        location: helixkv
-        name: nethelix-staging-kusto-ad-application
-      dataSource: https://ingest-engdata.kusto.windows.net:443
-      additionalParameters: Authority Id=72f988bf-86f1-41af-91ab-2d7cd011db47
-      

.vault-config/dotneteng-status-prod.yaml

@@ -25,15 +25,6 @@ secrets:
     parameters:
       environment: dotnet-eng-grafana.westus2.cloudapp.azure.com
 
-  nethelix-engsrv-kusto-connection-string-ingest:
-    type: kusto-connection-string
-    parameters:
-      adApplication:
-        location: helixkv
-        name: nethelix-prod-kusto-ad-application
-      dataSource: https://ingest-engsrvprod.kusto.windows.net:443
-      additionalParameters: Streaming=true;Authority Id=72f988bf-86f1-41af-91ab-2d7cd011db47
-
   build-monitor-hook-dotnet-eng-status-token:
     type: text
     parameters:

.vault-config/dotneteng-status-staging.yaml

@@ -24,12 +24,3 @@ secrets:
     type: grafana-api-key
     parameters:
       environment: dotnet-eng-grafana-staging.westus2.cloudapp.azure.com
-
-  nethelix-engsrv-kusto-connection-string-ingest:
-    type: kusto-connection-string
-    parameters:
-      adApplication:
-        location: helixkv
-        name: nethelix-staging-kusto-ad-application
-      dataSource: https://ingest-engdata.kusto.windows.net:443
-      additionalParameters: Authority Id=72f988bf-86f1-41af-91ab-2d7cd011db47

.vault-config/helixkv.yaml

@@ -5,12 +5,6 @@ storageLocation:
     name: helixkv
 
 secrets:
-  nethelix-staging-kusto-ad-application:
-    type: ad-application
-
-  nethelix-prod-kusto-ad-application:
-    type: ad-application
-
   dn-bot-account-redmond:
     type: domain-account
     parameters:
@@ -21,4 +15,10 @@ secrets:
     type: domain-account
     parameters:
       accountName: dnb2-bot
-      description: The dnb2-bot account
+      description: The dnb2-bot account
+
+  dn-dependabot-account-redmond:
+    type: domain-account
+    parameters:
+      accountName: dn-dependabot
+      description: The dn-dependabot account

.vault-config/service-connections-devdiv.yaml

@@ -38,6 +38,19 @@ secrets:
           organizations: dnceng
           scopes: packaging_write
 
+  dnceng-dotnet10:
+    type: azure-devops-service-endpoint
+    parameters:
+      authorization:
+        type: azure-devops-access-token
+        parameters:
+          domainAccountName: dn-bot
+          domainAccountSecret:
+            location: helixkv
+            name: dn-bot-account-redmond
+          organizations: dnceng
+          scopes: packaging_write
+
   dnceng-dotnet9:
     type: azure-devops-service-endpoint
     parameters:
@@ -90,6 +103,19 @@ secrets:
           organizations: dnceng
           scopes: packaging_write
 
+  dnceng-dotnet10-workloads:
+    type: azure-devops-service-endpoint
+    parameters:
+      authorization:
+        type: azure-devops-access-token
+        parameters:
+          domainAccountName: dn-bot
+          domainAccountSecret:
+            location: helixkv
+            name: dn-bot-account-redmond
+          organizations: dnceng
+          scopes: packaging_write
+
   dotnet-tools-dnceng-public-feed:
     type: azure-devops-service-endpoint
     parameters:

.vault-config/telemetryint.yaml

@@ -12,22 +12,3 @@ references:
       name: helixkv
 
 importSecretsFrom: shared/telemetry-secrets.yaml
-
-secrets:
-  nethelix-engsrv-kusto-connection-string-ingest:
-    type: kusto-connection-string
-    parameters:
-      adApplication:
-        location: helixkv
-        name: nethelix-staging-kusto-ad-application
-      dataSource: https://ingest-engdata.kusto.windows.net:443
-      additionalParameters: Streaming=true;Authority Id=72f988bf-86f1-41af-91ab-2d7cd011db47
-
-  nethelix-engsrv-kusto-connection-string-query:
-    type: kusto-connection-string
-    parameters:
-      adApplication:
-        location: helixkv
-        name: nethelix-staging-kusto-ad-application
-      dataSource: https://engdata.kusto.windows.net:443
-      additionalParameters: Authority Id=72f988bf-86f1-41af-91ab-2d7cd011db47

.vault-config/telemetrylocal.yaml

@@ -12,13 +12,3 @@ references:
       name: helixkv
 
 importSecretsFrom: shared/telemetry-secrets.yaml
-
-secrets:
-  nethelix-engsrv-kusto-connection-string-query:
-    type: kusto-connection-string
-    parameters:
-      adApplication:
-        location: helixkv
-        name: nethelix-staging-kusto-ad-application
-      dataSource: https://engdata.kusto.windows.net:443
-      additionalParameters: Authority Id=72f988bf-86f1-41af-91ab-2d7cd011db47

.vault-config/telemetryprod.yaml

@@ -12,22 +12,3 @@ references:
       name: helixkv
 
 importSecretsFrom: shared/telemetry-secrets.yaml
-
-secrets:
-  nethelix-engsrv-kusto-connection-string-ingest:
-    type: kusto-connection-string
-    parameters:
-      adApplication:
-        location: helixkv
-        name: nethelix-prod-kusto-ad-application
-      dataSource: https://ingest-engsrvprod.kusto.windows.net:443
-      additionalParameters: Streaming=true;Authority Id=72f988bf-86f1-41af-91ab-2d7cd011db47
-
-  nethelix-engsrv-kusto-connection-string-query:
-    type: kusto-connection-string
-    parameters:
-      adApplication:
-        location: helixkv
-        name: nethelix-prod-kusto-ad-application
-      dataSource: https://engsrvprod.kusto.windows.net:443
-      additionalParameters: Authority Id=72f988bf-86f1-41af-91ab-2d7cd011db47

Directory.Build.props

@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <NoWarn>$(NoWarn);NU5125;CA1416;NU1507</NoWarn>
     <!--
       We sort of half sort of support macOS in this repo, this warning is telling us that we are on the precipice of
@@ -49,7 +49,7 @@
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(IsTestProject)' == 'true' ">
-    <PackageReference Include="FluentAssertions" />
+    <PackageReference Include="AwesomeAssertions" />
     <PackageReference Include="Moq" />
     <PackageReference Include="NUnit" />
     <PackageReference Include="NUnit3TestAdapter">

Directory.Packages.props

@@ -11,7 +11,8 @@
     <!-- Note: These libraries can be loaded by Arcade SDK clients, which may already have a
          newer copy of this package loaded. When updating one, be aware of the other to prevent runtime issues
          See: https://github.com/dotnet/arcade/blob/main/eng/Versions.props -->
-    <PackageVersion Include="Azure.Core" Version="1.41.0" />
+    <PackageVersion Include="AwesomeAssertions" Version="9.0.0" />
+    <PackageVersion Include="Azure.Core" Version="1.45.0" />
     <PackageVersion Include="Azure.Data.Tables" Version="12.9.0" />
     <PackageVersion Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.3.4" />
     <PackageVersion Include="Azure.Extensions.AspNetCore.DataProtection.Keys" Version="1.2.3" />
@@ -24,7 +25,6 @@
     <PackageVersion Include="Azure.Storage.Blobs" Version="12.21.0" />
     <PackageVersion Include="Azure.Storage.Queues" Version="12.19.0" />
     <PackageVersion Include="ConsoleTables" Version="2.4.2" />
-    <PackageVersion Include="FluentAssertions" Version="6.12.0" />
     <PackageVersion Include="JetBrains.Annotations" Version="11.1.0" PrivateAssets="All" />
     <PackageVersion Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
     <PackageVersion Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
@@ -57,15 +57,15 @@
     <PackageVersion Include="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="$(MicrosoftDotNetSwaggerGeneratorMSBuildVersion)" />
     <PackageVersion Include="Microsoft.DotNet.VersionTools" Version="$(MicrosoftDotNetVersionToolsVersion)" />
     <PackageVersion Include="Microsoft.DotNet.Web.Authentication" Version="$(MicrosoftDotNetWebAuthenticationVersion)" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Http" Version="6.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.4" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.ApplicationInsights" Version="2.21.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="6.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Identity.Client" Version="4.62.0-preview" />
     <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.0.0" />
     <PackageVersion Include="Microsoft.NET.Sdk.Functions" Version="4.1.1" />
@@ -81,6 +81,7 @@
     <PackageVersion Include="NUnit" Version="4.2.2" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
     <PackageVersion Include="Octokit" Version="13.0.1" />
+    <PackageVersion Include="OpenTelemetry.Audit.Geneva" Version="2.2.3" Condition=" '$(DefineConstants)' != '' AND '$(DefineConstants.Contains(INTERNAL))' " />
     <PackageVersion Include="ServiceFabricMocks" Version="$(ServiceFabricMocksVersion)" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta1.21308.1" />
     <PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />