Skip to content

Commit 778bceb

Browse files
dotnet-policy-service[bot]dotnet-policy-service[bot]
authored
Merge pull request #10441 from dotnet/main
Merge main into live
2 parents ffa8e8d + 29788eb commit 778bceb

File tree

46 files changed

+860
-1738
lines changed

Some content is hidden

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

46 files changed

+860
-1738
lines changed

‎includes/forms-auth-warning.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
> [!WARNING]
2+
> Storing user credentials in the `credentials` section is **insecure**. Instead, use [Azure Key Vault](/azure/key-vault/general/overview).

‎includes/ropc-warning.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
> [!WARNING]
2+
> Microsoft does not recommend providing your user name and password directly, because it's an insecure pattern. Where possible, use more secure authentication flows, such as [Managed Identities for Azure resources](/sql/connect/ado-net/sql/azure-active-directory-authentication#using-managed-identity-authentication), or [Windows authentication](/sql/relational-databases/security/choose-an-authentication-mode#connecting-through-windows-authentication) for SQL Server.

‎quest-config.json‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,26 @@
99
"ParentNodes": [
1010
{
1111
"Label": "user-feedback",
12+
"Semester": "Selenium",
13+
"ParentNodeId": 286039
14+
},
15+
{
16+
"Label": "doc-bug",
17+
"Semester": "Selenium",
18+
"ParentNodeId": 286039
19+
},
20+
{
21+
"Label": "doc-update",
22+
"Semester": "Selenium",
23+
"ParentNodeId": 286038
24+
},
25+
{
26+
"Semester": "Selenium",
27+
"ParentNodeId": 286016
28+
},
29+
{
30+
"Label": "user-feedback",
31+
"Semester": "Dilithium",
1232
"ParentNodeId": 233465
1333
},
1434
{
@@ -17,8 +37,13 @@
1737
},
1838
{
1939
"Label": "doc-update",
40+
"Semester": "Dilithium",
2041
"ParentNodeId": 237266
42+
},
43+
{
44+
"Semester": "Dilithium",
45+
"ParentNodeId": 227485
2146
}
2247
],
23-
"DefaultParentNode": 227485
48+
"DefaultParentNode": 286016
2449
}

‎snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteReader Example/CS/Project.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
</PropertyGroup>
7-
7+
88
<ItemGroup>
9-
<PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
9+
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
1010
</ItemGroup>
11-
11+
1212
</Project>

‎snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteReader2/CS/Project.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
2+
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
</PropertyGroup>
7-
7+
88
<ItemGroup>
9-
<PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
9+
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
1010
</ItemGroup>
11-
11+
1212
</Project>

‎snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/CS/Project.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
9+
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
1010
</ItemGroup>
1111

12-
</Project>
12+
</Project>

‎snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction2 Example/CS/Project.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
9+
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
1010
</ItemGroup>
1111

12-
</Project>
12+
</Project>

‎snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction3 Example/CS/Project.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
9+
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
1010
</ItemGroup>
1111

12-
</Project>
12+
</Project>

‎snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Read Example/CS/SqlDataReader.Read.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
6-
<Nullable>enable</Nullable>
5+
<TargetFramework>net8.0</TargetFramework>
76
</PropertyGroup>
87

98
<ItemGroup>
10-
<PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
9+
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
1110
</ItemGroup>
1211

1312
</Project>

‎snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.Remove/CS/Project.csproj‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net8.0</TargetFramework>
6+
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
10+
</ItemGroup>
11+
12+
</Project>

0 commit comments

Comments
 (0)