Skip to content

Commit af67ae1

Browse files
mmitchemmitche
committed
Merge remote-tracking branch 'upstream/main' into remove-storage-key-tests
2 parents b5594fe + b399a0e commit af67ae1

File tree

117 files changed

+4171
-2078
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+4171
-2078
lines changed

‎.config/tsaoptions.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"instanceUrl": "https://devdiv.visualstudio.com/",
3+
"template": "TFSDEVDIV",
4+
"projectName": "DEVDIV",
5+
"areaPath": "DevDiv\\NET Fundamentals\\Infrastructure\\Arcade\\SDL",
6+
"iterationPath": "DevDiv",
7+
"notificationAliases": [ "[email protected]" ],
8+
"repositoryName":"dotnet-dnceng",
9+
"codebaseName": "dotnet-dnceng"
10+
}

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@ keys:
1919
importSecretsFrom: shared/dotneteng-status-secrets.yaml
2020

2121
secrets:
22-
dotnet-status-storage-account:
23-
type: azure-storage-connection-string
24-
parameters:
25-
subscription: 68672ab8-de0c-40f1-8d1b-ffb20bd62c0f
26-
account: dotnetengstatusprod
27-
2822
# Grafana API key with admin privileges
2923
grafana-api-token:
3024
type: grafana-api-key

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@ keys:
1919
importSecretsFrom: shared/dotneteng-status-secrets.yaml
2020

2121
secrets:
22-
dotnet-status-storage-account:
23-
type: azure-storage-connection-string
24-
parameters:
25-
subscription: cab65fc3-d077-467d-931f-3932eabf36d3
26-
account: dotnetengstatusstaging
27-
2822
# Grafana API key with admin privileges
2923
grafana-api-token:
3024
type: grafana-api-key

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

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
storageLocation:
2+
type: azure-devops-project
3+
parameters:
4+
organization: devdiv
5+
project: DevDiv
6+
7+
references:
8+
helixkv:
9+
type: azure-key-vault
10+
parameters:
11+
subscription: a4fc5514-21a9-4296-bfaf-5c7ee7fa35d1
12+
name: helixkv
13+
14+
secrets:
15+
dotnet-eng:
16+
type: azure-devops-service-endpoint
17+
parameters:
18+
authorization:
19+
type: azure-devops-access-token
20+
parameters:
21+
domainAccountName: dn-bot
22+
domainAccountSecret:
23+
location: helixkv
24+
name: dn-bot-account-redmond
25+
organizations: dnceng
26+
scopes: packaging_write
27+
28+
dnceng-test-tools-feed:
29+
type: azure-devops-service-endpoint
30+
parameters:
31+
authorization:
32+
type: azure-devops-access-token
33+
parameters:
34+
domainAccountName: dn-bot
35+
domainAccountSecret:
36+
location: helixkv
37+
name: dn-bot-account-redmond
38+
organizations: dnceng
39+
scopes: packaging_write
40+
41+
dnceng-dotnet9:
42+
type: azure-devops-service-endpoint
43+
parameters:
44+
authorization:
45+
type: azure-devops-access-token
46+
parameters:
47+
domainAccountName: dn-bot
48+
domainAccountSecret:
49+
location: helixkv
50+
name: dn-bot-account-redmond
51+
organizations: dnceng
52+
scopes: packaging_write
53+
54+
dnceng-dotnet8:
55+
type: azure-devops-service-endpoint
56+
parameters:
57+
authorization:
58+
type: azure-devops-access-token
59+
parameters:
60+
domainAccountName: dn-bot
61+
domainAccountSecret:
62+
location: helixkv
63+
name: dn-bot-account-redmond
64+
organizations: dnceng
65+
scopes: packaging_write
66+
67+
dnceng-dotnet8-workloads:
68+
type: azure-devops-service-endpoint
69+
parameters:
70+
authorization:
71+
type: azure-devops-access-token
72+
parameters:
73+
domainAccountName: dn-bot
74+
domainAccountSecret:
75+
location: helixkv
76+
name: dn-bot-account-redmond
77+
organizations: dnceng
78+
scopes: packaging_write
79+
80+
dnceng-dotnet9-workloads:
81+
type: azure-devops-service-endpoint
82+
parameters:
83+
authorization:
84+
type: azure-devops-access-token
85+
parameters:
86+
domainAccountName: dn-bot
87+
domainAccountSecret:
88+
location: helixkv
89+
name: dn-bot-account-redmond
90+
organizations: dnceng
91+
scopes: packaging_write
92+
93+
dotnet-tools-dnceng-public-feed:
94+
type: azure-devops-service-endpoint
95+
parameters:
96+
authorization:
97+
type: azure-devops-access-token
98+
parameters:
99+
domainAccountName: dn-bot
100+
domainAccountSecret:
101+
location: helixkv
102+
name: dn-bot-account-redmond
103+
organizations: dnceng
104+
scopes: packaging_write
105+
106+
dnceng/internal:
107+
type: azure-devops-service-endpoint
108+
parameters:
109+
authorization:
110+
type: azure-devops-access-token
111+
parameters:
112+
domainAccountName: dn-bot
113+
domainAccountSecret:
114+
location: helixkv
115+
name: dn-bot-account-redmond
116+
organizations: dnceng
117+
scopes: code

‎.vault-config/service-connections-dnceng.yaml‎

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
storageLocation:
2+
type: azure-devops-project
3+
parameters:
4+
organization: dnceng
5+
project: internal
6+
7+
references:
8+
helixkv:
9+
type: azure-key-vault
10+
parameters:
11+
subscription: a4fc5514-21a9-4296-bfaf-5c7ee7fa35d1
12+
name: helixkv
13+
14+
secrets:
15+
devdiv/dotnet-core-internal-tooling:
16+
type: azure-devops-service-endpoint
17+
parameters:
18+
authorization:
19+
type: azure-devops-access-token
20+
parameters:
21+
domainAccountName: dn-bot
22+
domainAccountSecret:
23+
location: helixkv
24+
name: dn-bot-account-redmond
25+
organizations: devdiv
26+
scopes: packaging_write
27+
28+
DevDiv - VS package feed:
29+
type: azure-devops-service-endpoint
30+
parameters:
31+
authorization:
32+
type: azure-devops-access-token
33+
parameters:
34+
domainAccountName: dn-bot
35+
domainAccountSecret:
36+
location: helixkv
37+
name: dn-bot-account-redmond
38+
organizations: devdiv
39+
scopes: packaging_write
40+
41+
devdiv/engineering:
42+
type: azure-devops-service-endpoint
43+
parameters:
44+
authorization:
45+
type: azure-devops-access-token
46+
parameters:
47+
domainAccountName: dn-bot
48+
domainAccountSecret:
49+
location: helixkv
50+
name: dn-bot-account-redmond
51+
organizations: devdiv
52+
scopes: packaging
53+
54+
DevDiv Org - Repo Access:
55+
type: azure-devops-service-endpoint
56+
parameters:
57+
authorization:
58+
type: azure-devops-access-token
59+
parameters:
60+
domainAccountName: dn-bot
61+
domainAccountSecret:
62+
location: helixkv
63+
name: dn-bot-account-redmond
64+
organizations: devdiv
65+
scopes: build_execute code_write
66+
67+
azure-public/vssdk:
68+
type: azure-devops-service-endpoint
69+
parameters:
70+
authorization:
71+
type: azure-devops-access-token
72+
parameters:
73+
domainAccountName: dn-bot
74+
domainAccountSecret:
75+
location: helixkv
76+
name: dn-bot-account-redmond
77+
organizations: azure-public
78+
scopes: packaging_write
79+
80+
azure-public/vs-impl:
81+
type: azure-devops-service-endpoint
82+
parameters:
83+
authorization:
84+
type: azure-devops-access-token
85+
parameters:
86+
domainAccountName: dn-bot
87+
domainAccountSecret:
88+
location: helixkv
89+
name: dn-bot-account-redmond
90+
organizations: azure-public
91+
scopes: packaging_write
92+
93+
dotnet-security-partners-dotnet-dotnet feed:
94+
type: azure-devops-service-endpoint
95+
parameters:
96+
authorization:
97+
type: azure-devops-access-token
98+
parameters:
99+
domainAccountName: dn-bot
100+
domainAccountSecret:
101+
location: helixkv
102+
name: dn-bot-account-redmond
103+
organizations: dotnet-security-partners
104+
scopes: packaging_write
105+
106+
dotnet-sb-validation feed:
107+
type: azure-devops-service-endpoint
108+
parameters:
109+
authorization:
110+
type: azure-devops-access-token
111+
parameters:
112+
domainAccountName: dn-bot
113+
domainAccountSecret:
114+
location: helixkv
115+
name: dn-bot-account-redmond
116+
organizations: dnceng
117+
scopes: packaging_write

‎.vault-config/shared/dotneteng-status-secrets.yaml‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,6 @@ github:
44
hasPrivateKey: true
55
hasWebhookSecret: true
66
hasOAuthSecret: true
7-
8-
token-table-sas-uri:
9-
type: azure-storage-table-sas-uri
10-
parameters:
11-
connectionString: dotnet-status-storage-account
12-
permissions: rau
13-
table: tokens
14-
15-
deployment-table-sas-uri:
16-
type: azure-storage-table-sas-uri
17-
parameters:
18-
connectionString: dotnet-status-storage-account
19-
permissions: rau
20-
table: deployments
21-
22-
data-protection-key-file-uri:
23-
type: azure-storage-blob-sas-uri
24-
parameters:
25-
connectionString: dotnet-status-storage-account
26-
permissions: racwd
27-
container: site
28-
blob: keys.xml
297

308
fr-teams-channel-webhook-url:
319
type: text

‎Directory.Packages.props‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
newer copy of this package loaded. When updating one, be aware of the other to prevent runtime issues
1313
See: https://github.com/dotnet/arcade/blob/main/eng/Versions.props -->
1414
<PackageVersion Include="Azure.Core" Version="1.41.0" />
15-
<PackageVersion Include="Azure.Data.Tables" Version="12.8.3" />
15+
<PackageVersion Include="Azure.Data.Tables" Version="12.9.0" />
1616
<PackageVersion Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.3.4" />
1717
<PackageVersion Include="Azure.Extensions.AspNetCore.DataProtection.Keys" Version="1.2.3" />
1818
<PackageVersion Include="Azure.Identity" Version="1.12.0" />
@@ -24,14 +24,14 @@
2424
<PackageVersion Include="Azure.Storage.Blobs" Version="12.21.0" />
2525
<PackageVersion Include="Azure.Storage.Queues" Version="12.19.0" />
2626
<PackageVersion Include="ConsoleTables" Version="2.4.2" />
27-
<PackageVersion Include="FluentAssertions" Version="6.11.0" />
27+
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
2828
<PackageVersion Include="JetBrains.Annotations" Version="11.1.0" PrivateAssets="All" />
2929
<PackageVersion Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
3030
<PackageVersion Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
3131
<PackageVersion Include="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
3232
<PackageVersion Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
3333
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="$(AspNetCoreVersion)" />
34-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetCoreVersion)" />
34+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.36" />
3535
<PackageVersion Include="Microsoft.AspNetCore.WebHooks.Receivers" Version="1.0.0-preview2-final" />
3636
<PackageVersion Include="Microsoft.AspNetCore.WebHooks.Receivers.GitHub" Version="1.0.0-preview2-final" />
3737
<PackageVersion Include="Microsoft.Azure.Kusto.Ingest" Version="12.2.1" />
@@ -61,11 +61,11 @@
6161
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
6262
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
6363
<PackageVersion Include="Microsoft.Extensions.Http" Version="6.0.0" />
64-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.0" />
65-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
64+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.1" />
65+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.4" />
6666
<PackageVersion Include="Microsoft.Extensions.Logging.ApplicationInsights" Version="2.21.0" />
6767
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
68-
<PackageVersion Include="Microsoft.Extensions.Options" Version="6.0.0" />
68+
<PackageVersion Include="Microsoft.Extensions.Options" Version="6.0.1" />
6969
<PackageVersion Include="Microsoft.Identity.Client" Version="4.62.0-preview" />
7070
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.0.0" />
7171
<PackageVersion Include="Microsoft.NET.Sdk.Functions" Version="4.1.1" />
@@ -78,8 +78,8 @@
7878
<PackageVersion Include="Mono.Options" Version="5.3.0.1" />
7979
<PackageVersion Include="Moq" Version="4.8.3" />
8080
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
81-
<PackageVersion Include="NUnit" Version="3.13.3" />
82-
<PackageVersion Include="NUnit3TestAdapter" Version="3.16.1" />
81+
<PackageVersion Include="NUnit" Version="4.2.2" />
82+
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
8383
<PackageVersion Include="Octokit" Version="13.0.1" />
8484
<PackageVersion Include="ServiceFabricMocks" Version="$(ServiceFabricMocksVersion)" />
8585
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta1.21308.1" />
@@ -91,7 +91,7 @@
9191
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
9292
<PackageVersion Include="System.Security.Cryptography.Xml" Version="8.0.1" />
9393
<PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />
94-
<PackageVersion Include="System.Text.Json" Version="8.0.4" />
94+
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
9595
<PackageVersion Include="WindowsAzure.Storage" Version="9.3.3" />
9696
<PackageVersion Include="YamlDotNet" Version="9.1.4" />
9797
<PackageVersion Include="YamlDotNet.Signed" Version="5.3.0" />

0 commit comments

Comments
 (0)