Skip to content

Commit c283322

Browse files
gewarrengewarren
committed
Merge branch 'main' of github.com:dotnet/dotnet-api-docs into ropc-fixes-chunk2
2 parents 6c26de3 + 912ede2 commit c283322

File tree

99 files changed

+1490
-1888
lines changed

Some content is hidden

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

99 files changed

+1490
-1888
lines changed

‎snippets/csharp/System.Data/EntityKey/Overview/app.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<connectionStrings>
4-
<add name="AdventureWorksEntities" connectionString="metadata=res://*/AdventureWorksModel.csdl|res://*/AdventureWorksModel.ssdl|res://*/AdventureWorksModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;Data Source=juliakornich;Initial Catalog=AdventureWorks;Integrated Security=True;MultipleActiveResultSets=True&quot;" providerName="System.Data.EntityClient" />
5-
<add name="SchoolEntities" connectionString="metadata=res://*/School.csdl|res://*/School.ssdl|res://*/School.msl;provider=System.Data.SqlClient;provider connection string=&quot;Data Source=juliakornich;Initial Catalog=School;Integrated Security=True;MultipleActiveResultSets=True&quot;" providerName="System.Data.EntityClient" />
4+
<add name="AdventureWorksEntities" connectionString="metadata=res://*/AdventureWorksModel.csdl|res://*/AdventureWorksModel.ssdl|res://*/AdventureWorksModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;Data Source=localhost;Initial Catalog=AdventureWorks;Integrated Security=True;MultipleActiveResultSets=True&quot;" providerName="System.Data.EntityClient" />
5+
<add name="SchoolEntities" connectionString="metadata=res://*/School.csdl|res://*/School.ssdl|res://*/School.msl;provider=System.Data.SqlClient;provider connection string=&quot;Data Source=localhost;Initial Catalog=School;Integrated Security=True;MultipleActiveResultSets=True&quot;" providerName="System.Data.EntityClient" />
66
</connectionStrings>
7-
</configuration>
7+
</configuration>

‎snippets/csharp/System.IdentityModel.Services/SessionAuthenticationModule/Overview/web.config.backup.1‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎snippets/csharp/System.IdentityModel.Services/SignInRequestMessage/Overview/web.config.backup.1‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎snippets/csharp/System.IdentityModel.Services/WSFederationAuthenticationModule/Overview/web.config.backup.1‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcCommand/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>Library</OutputType>
5+
<TargetFramework>net8</TargetFramework>
6+
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<PackageReference Include="System.Data.Odbc" />
10+
</ItemGroup>
11+
12+
</Project>

‎snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcCommand/CS/source.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44

55
class Program
66
{
7-
static void Main()
8-
{
9-
//string connectionString = "Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\\Samples\\Northwind.mdb";
10-
}
117
// <Snippet1>
128
public void InsertRow(string connectionString, string insertSQL)
139
{
@@ -31,6 +27,6 @@ public void InsertRow(string connectionString, string insertSQL)
3127
// The connection is automatically closed when the
3228
// code exits the using block.
3329
}
34-
// </Snippet1>
3530
}
31+
// </Snippet1>
3632
}

‎snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction/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>Library</OutputType>
5+
<TargetFramework>net8</TargetFramework>
6+
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<PackageReference Include="System.Data.Odbc" />
10+
</ItemGroup>
11+
12+
</Project>

‎snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction/CS/source.cs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@
44

55
class Program
66
{
7-
static void Main()
8-
{
9-
string connectionString = "Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\\Samples\\Northwind.mdb";
10-
ExecuteTransaction(connectionString);
11-
}
127
// <Snippet1>
138
public static void ExecuteTransaction(string connectionString)
149
{
@@ -61,6 +56,6 @@ public static void ExecuteTransaction(string connectionString)
6156
// The connection is automatically closed when the
6257
// code exits the using block.
6358
}
64-
// </Snippet1>
6559
}
60+
// </Snippet1>
6661
}

‎snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction1/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>Library</OutputType>
5+
<TargetFramework>net8</TargetFramework>
6+
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<PackageReference Include="System.Data.Odbc" />
10+
</ItemGroup>
11+
12+
</Project>

‎snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction1/CS/source.cs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@
44

55
class Program
66
{
7-
static void Main()
8-
{
9-
string connectionString = "Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\\Samples\\Northwind.mdb";
10-
ExecuteTransaction(connectionString);
11-
}
127
// <Snippet1>
138
public static void ExecuteTransaction(string connectionString)
149
{
@@ -61,6 +56,6 @@ public static void ExecuteTransaction(string connectionString)
6156
// The connection is automatically closed when the
6257
// code exits the using block.
6358
}
64-
// </Snippet1>
6559
}
60+
// </Snippet1>
6661
}

0 commit comments

Comments
 (0)