Merge branch 'main' into remove-sas-support

dotnet · Aug 1, 2024 · cc5834c · cc5834c
2 parents 7d8eace + a3dae8d
commit cc5834c
Show file tree

Hide file tree

Showing 36 changed files with 335 additions and 423 deletions.
diff --git a/.vault-config/dnceng-partners-kv.yaml b/.vault-config/dnceng-partners-kv.yaml
@@ -5,12 +5,6 @@ storageLocation:
     name: dnceng-partners-kv
 
 references:
-  dotnetbuildskeys:
-    type: azure-key-vault
-    parameters:
-      subscription: 11c6037b-227b-4d63-bee1-18c7b68c3a40
-      name: dotnetbuildskeys
-
   dotnetstagekeys:
     type: azure-key-vault
     parameters:
@@ -30,15 +24,6 @@ references:
       name: helixkv
 
 secrets:
-  dotnetbuilds-internal-container-read-token:
-    type: azure-storage-container-sas-token
-    parameters:
-      connectionString:
-        name: dotnetbuilds-connection-string
-        location: dotnetbuildskeys
-      permissions: rl
-      container: internal
-
   dotnetstage-account-sas-read-token:
     type: azure-storage-account-sas-token
     parameters:

diff --git a/.vault-config/dotnetbuildskeys.yaml b/.vault-config/dotnetbuildskeys.yaml
diff --git a/.vault-config/dotnetbuildstokens.yaml b/.vault-config/dotnetbuildstokens.yaml
diff --git a/.vault-config/product-builds-dnceng-pipeline-secrets.yaml b/.vault-config/product-builds-dnceng-pipeline-secrets.yaml
@@ -30,17 +30,6 @@ secrets:
         name: BotAccount-dotnet-comment-bot
       gitHubBotAccountName: dotnet-comment-bot
 
-  #DotNet-DotNetCli-Storage
-  dotnetcli-storage-key:
-    type: text
-    parameters:
-      description: set to never expire
-
-  dotnetclichecksums-storage-key:
-    type: text
-    parameters:
-      description: set to never expire
-
   # Service Principal used by the Guardian APIScan build task
   apiscan-service-principal-app-id:
     type: text

diff --git a/.vault-config/product-builds-engkeyvault.yaml b/.vault-config/product-builds-engkeyvault.yaml
@@ -10,12 +10,6 @@ references:
     parameters:
       subscription: a4fc5514-21a9-4296-bfaf-5c7ee7fa35d1
       name: helixkv
-
-  dotnetbuildskeys:
-    type: azure-key-vault
-    parameters:
-      subscription: 11c6037b-227b-4d63-bee1-18c7b68c3a40
-      name: dotnetbuildskeys
 
 secrets:
   BotAccount-dotnet-maestro-bot:
@@ -28,13 +22,6 @@ secrets:
     parameters:
       Name: dotnet-bot
 
-  #DotNet-Blob-Feed
-  dotnetfeed-storage-access-key-1:
-    type: azure-storage-key
-    parameters:
-      subscription: a4fc5514-21a9-4296-bfaf-5c7ee7fa35d1
-      account: dotnetfeed
-
   #Publish-Build-Assets
   BotAccount-dotnet-maestro-bot-PAT:
     type: github-access-token
@@ -59,19 +46,10 @@ secrets:
       organizations: dnceng
       scopes: build_execute code_write
 
-  akams:
-    type: ad-application
-
-  publishing-dnceng-devdiv-code-r-build-re:
-    type: azure-devops-access-token
+  akams-client-id:
+    type: text
     parameters:
-      domainAccountName: dn-bot
-      domainAccountSecret:
-          location: helixkv
-          name: dn-bot-account-redmond
-      name: publishing-dnceng-devdiv-code
-      organizations: dnceng devdiv
-      scopes: code build_execute 
+      description: Client id for akams app
 
   dn-bot-dotnet-build-rw-code-rw:
     type: azure-devops-access-token
@@ -162,66 +140,7 @@ secrets:
           name: dn-bot-account-redmond
       name: dn-symweb-symbol-server-pat
       organizations: microsoft
-      scopes: symbols_write 
-
-  dotnetfeedmsrc-storage-access-key-1:
-    type: text
-    parameters:
-      description: Also located in dnceng-pipeline-secrets keyvault.
-
-  dotnetfeedmsrc-connection-string:
-    type: azure-storage-connection-string
-    parameters:
-      storageKeySecret: dotnetfeedmsrc-storage-access-key-1
-      account: dotnetfeedmsrc
-
-  dotnetfeedmsrc-read-sas-token:
-    type: azure-storage-container-sas-token
-    parameters:
-      connectionString: dotnetfeedmsrc-connection-string
-      permissions: r
-      container: $root
-
-  dotnetfeedmsrc-read-sas-token-base64:
-    type: base64-encoder
-    parameters:
-      secret: dotnetfeedmsrc-read-sas-token
-
-  dotnetbuilds-internal-container-read-token:
-    type: azure-storage-container-sas-token
-    parameters:
-      connectionString:
-        name: dotnetbuilds-connection-string
-        location: dotnetbuildskeys
-      permissions: rl
-      container: internal
-
-  dotnetbuilds-public-container-read-token:
-    type: azure-storage-container-sas-token
-    parameters:
-      connectionString:
-        name: dotnetbuilds-connection-string
-        location: dotnetbuildskeys
-      permissions: rl
-      container: public
-
-  dotnetbuilds-internal-checksums-container-read-token:
-    type: azure-storage-container-sas-token
-    parameters:
-      connectionString:
-        name: dotnetbuilds-connection-string
-        location: dotnetbuildskeys
-      permissions: rl
-      container: internal-checksums
-
-  dotnetbuilds-public-checksums-container-read-token:
-    type: azure-storage-container-sas-token
-    parameters:
-      connectionString:
-        name: dotnetbuilds-connection-string
-        location: dotnetbuildskeys
-      permissions: rl
-      container: public-checksums
+      scopes: symbols_write
 
   #OneLocBuildVariables
   dn-bot-ceapex-package-r:

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -15,9 +15,9 @@
     <MicrosoftSignedWixVersion>3.14.1-8722.20240403.1</MicrosoftSignedWixVersion>
     <!-- Overwrite XUnitVersion/XUnitAnalyzersVersion/XUnitAnalyzersVersion that comes from the Arcade SDK to be in sync as Arcade doesn't use a live Arcade SDK.
          Keep in sync with DefaultVersions.props. -->
-    <XUnitVersion>2.8.1</XUnitVersion>
-    <XUnitAnalyzersVersion>1.14.0</XUnitAnalyzersVersion>
-    <XUnitRunnerVisualStudioVersion>2.8.1</XUnitRunnerVisualStudioVersion>
+    <XUnitVersion>2.9.0</XUnitVersion>
+    <XUnitAnalyzersVersion>1.15.0</XUnitAnalyzersVersion>
+    <XUnitRunnerVisualStudioVersion>2.8.2</XUnitRunnerVisualStudioVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Documentation/AzureDevOps/SendingJobsToHelix.md b/Documentation/AzureDevOps/SendingJobsToHelix.md
@@ -83,7 +83,7 @@ The simplest Helix use-case is zipping up a single folder containing your projec
 Simply specify the xUnit project(s) you wish to run (semicolon delimited) with the `XUnitProjects` parameter. Then, specify:
 * the `XUnitPublishTargetFramework` &ndash; this is the framework your **test projects are targeting**, e.g. `netcoreapp3.1`.
 * the `XUnitRuntimeTargetFramework` &ndash; this is the framework version of xUnit you want to use from the xUnit NuGet package, e.g. `netcoreapp2.0`. Notably, the xUnit console runner only supports up to netcoreapp2.0 as of 14 March 2018, so this is the target that should be specified for running against any higher version test projects.
-* the `XUnitRunnerVersion` (the version of the xUnit nuget package you want to use, e.g. `2.8.1`).
+* the `XUnitRunnerVersion` (the version of the xUnit nuget package you want to use, e.g. `2.9.0`).
 
 Finally, set `IncludeDotNetCli` to true and specify which `DotNetCliPackageType` (`sdk`, `runtime` or `aspnetcore-runtime`) and `DotNetCliVersion` you wish to use. (For a full list of .NET CLI versions/package types, see these links: [3.0](https://dotnet.microsoft.com/download/dotnet-core/3.0), [2.1](https://dotnet.microsoft.com/download/dotnet-core/2.1), [2.2](https://dotnet.microsoft.com/download/dotnet-core/2.2).)
 
@@ -104,7 +104,7 @@ The list of available Helix queues can be found on the [Helix homepage](https://
       # XUnitWorkItemTimeout: '00:05:00' -- a timeout (specified as a System.TimeSpan string) for all work items created from XUnitProjects
       XUnitPublishTargetFramework: netcoreapp3.1 # specify your publish target framework here
       XUnitRuntimeTargetFramework: netcoreapp2.0 # specify the framework you want to use for the xUnit runner
-      XUnitRunnerVersion: 2.8.1 # specify the version of xUnit runner you wish to use here
+      XUnitRunnerVersion: 2.9.0 # specify the version of xUnit runner you wish to use here
       # WorkItemDirectory: '' -- payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects
       # WorkItemCommand: '' -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects
       # WorkItemTimeout: '' -- a timeout (specified as a System.TimeSpan string) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects

diff --git a/Documentation/Darc.md b/Documentation/Darc.md
@@ -964,8 +964,8 @@ There are a few common parameters available on every command:
   checked. This setting overrides whatever GitHub PAT was provided through
   `darc authenticate`.
 - `--azdev-pat` - Personal access token used to authenticate to Azure DevOps.
-  This token should have Code Read permissions. This setting overrides whatever
-  Azure DevOps PAT was provided through `darc authenticate`.
+  This token should have Build Execute and Code Read permissions. This setting overrides whatever
+  Azure DevOps PAT was provided through `darc authenticate`. If no PAT is set, local credentials are used.
 - `--bar-uri` - URI of the build asset registry service to use.  Typically left
   as its default (https://maestro.dot.net) This setting
   overrides the Build Asset Registry URI provided through `darc authenticate`.

diff --git a/NuGet.config b/NuGet.config
@@ -11,9 +11,6 @@
     <add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
     <add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
     <add key="vs-buildservices" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
-    <!-- Remove the dotnet8 feeds: https://github.com/dotnet/arcade/issues/14280 -->
-    <add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
-    <add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
     <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
     <add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
   </packageSources>