SFI ROPC fixes - VB snippets (#42698)

gewarren · web-flow · commit 70f93e497a49 · 2024-09-24T21:49:24.000Z
diff --git a/samples/snippets/visualbasic/VS_Snippets_Data/DP L2E Conceptual Examples/VB/App.Config b/samples/snippets/visualbasic/VS_Snippets_Data/DP L2E Conceptual Examples/VB/App.Config
@@ -21,6 +21,6 @@
     </sharedListeners>
   </system.diagnostics>
   <connectionStrings>
-    <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" />
+    <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" />
   </connectionStrings>
-</configuration>
+</configuration>
diff --git a/samples/snippets/visualbasic/VS_Snippets_Data/DP L2E Examples/VB/App.Config b/samples/snippets/visualbasic/VS_Snippets_Data/DP L2E Examples/VB/App.Config
@@ -21,6 +21,6 @@
     </sharedListeners>
   </system.diagnostics>
   <connectionStrings>
-    <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" />
+    <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" />
   </connectionStrings>
-</configuration>
+</configuration>
diff --git a/samples/snippets/visualbasic/VS_Snippets_Data/DP L2E Materialization Example/VB/App.Config b/samples/snippets/visualbasic/VS_Snippets_Data/DP L2E Materialization Example/VB/App.Config
@@ -21,6 +21,6 @@
     </sharedListeners>
   </system.diagnostics>
   <connectionStrings>
-    <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" />
+    <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" />
   </connectionStrings>
-</configuration>
+</configuration>
diff --git a/samples/snippets/visualbasic/VS_Snippets_Data/DP ObjectServices Concepts/VB/app.config b/samples/snippets/visualbasic/VS_Snippets_Data/DP ObjectServices Concepts/VB/app.config
@@ -21,7 +21,7 @@
     </sharedListeners>
   </system.diagnostics>
   <connectionStrings>
-    <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"/>
-    <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"/>
+    <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"/>
+    <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"/>
   </connectionStrings>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
diff --git a/samples/snippets/visualbasic/VS_Snippets_Data/dp entityservices concepts/vb/app.config b/samples/snippets/visualbasic/VS_Snippets_Data/dp entityservices concepts/vb/app.config
@@ -21,7 +21,7 @@
     </sharedListeners>
   </system.diagnostics>
   <connectionStrings>
-    <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" />
-    <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" />
+    <add name="SchoolEntities" connectionString="metadata=res://*/School.csdl|res://*/School.ssdl|res://*/School.msl;provider=System.Data.SqlClient;provider connection string=&quot;Data Source=ds;Initial Catalog=School;Integrated Security=True;MultipleActiveResultSets=True&quot;" providerName="System.Data.EntityClient" />
+    <add name="AdventureWorksEntities" connectionString="metadata=res://*/AdventureWorksModel.csdl|res://*/AdventureWorksModel.ssdl|res://*/AdventureWorksModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;Data Source=ds;Initial Catalog=AdventureWorks;Integrated Security=True;MultipleActiveResultSets=True&quot;" providerName="System.Data.EntityClient" />
   </connectionStrings>
-</configuration>
+</configuration>
diff --git a/samples/snippets/visualbasic/VS_Snippets_Data/dp l2e arraysandlistsinqueries/vb/app.config b/samples/snippets/visualbasic/VS_Snippets_Data/dp l2e arraysandlistsinqueries/vb/app.config
@@ -21,6 +21,6 @@
     </sharedListeners>
   </system.diagnostics>
   <connectionStrings>
-    <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" />
+    <add name="AdventureWorksEntities" connectionString="metadata=res://*/AdventureWorksModel.csdl|res://*/AdventureWorksModel.ssdl|res://*/AdventureWorksModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;Data Source=ds;Initial Catalog=AdventureWorks;Integrated Security=True;MultipleActiveResultSets=True&quot;" providerName="System.Data.EntityClient" />
   </connectionStrings>
-</configuration>
+</configuration>
diff --git a/samples/snippets/visualbasic/VS_Snippets_Misc/tpldataflow_batchdatabase/vb/Project.vbproj b/samples/snippets/visualbasic/VS_Snippets_Misc/tpldataflow_batchdatabase/vb/Project.vbproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFrameworks>net8.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
+  </ItemGroup>
+
+ </Project>
diff --git a/samples/snippets/visualbasic/VS_Snippets_Misc/tpldataflow_batchdatabase/vb/dataflowbatchdatabase.vb b/samples/snippets/visualbasic/VS_Snippets_Misc/tpldataflow_batchdatabase/vb/dataflowbatchdatabase.vb
@@ -1,6 +1,7 @@
 ﻿' <snippet100>
 ' <snippet1>
 Imports System.Collections.Generic
+Imports System.Data.SqlClient
 Imports System.Data.SqlServerCe
 Imports System.Diagnostics
 Imports System.IO
@@ -61,10 +62,10 @@ Namespace DataflowBatchDatabase
         ' <snippet4>
         ' Adds new employee records to the database.
         Private Shared Sub InsertEmployees(ByVal employees() As Employee, ByVal connectionString As String)
-            Using connection As New SqlCeConnection(connectionString)
+            Using connection As New SqlConnection(connectionString)
                 Try
                     ' Create the SQL command.
-                    Dim command As New SqlCeCommand("INSERT INTO Employees ([Last Name], [First Name])" & "VALUES (@lastName, @firstName)", connection)
+                    Dim command As New SqlCommand("INSERT INTO Employees ([Last Name], [First Name])" & "VALUES (@lastName, @firstName)", connection)
 
                     connection.Open()
                     For i As Integer = 0 To employees.Length - 1
@@ -86,8 +87,8 @@ Namespace DataflowBatchDatabase
         ' the Northwind database.
         Private Shared Function GetEmployeeCount(ByVal connectionString As String) As Integer
             Dim result As Integer = 0
-            Using sqlConnection As New SqlCeConnection(connectionString)
-                Dim sqlCommand As New SqlCeCommand("SELECT COUNT(*) FROM Employees", sqlConnection)
+            Using sqlConnection As New SqlConnection(connectionString)
+                Dim sqlCommand As New SqlCommand("SELECT COUNT(*) FROM Employees", sqlConnection)
 
                 sqlConnection.Open()
                 Try
@@ -101,8 +102,8 @@ Namespace DataflowBatchDatabase
 
         ' Retrieves the ID of the first employee that has the provided name.
         Private Shared Function GetEmployeeID(ByVal lastName As String, ByVal firstName As String, ByVal connectionString As String) As Integer
-            Using connection As New SqlCeConnection(connectionString)
-                Dim command As New SqlCeCommand(String.Format("SELECT [Employee ID] FROM Employees " & "WHERE [Last Name] = '{0}' AND [First Name] = '{1}'", lastName, firstName), connection)
+            Using connection As New SqlConnection(connectionString)
+                Dim command As New SqlCommand(String.Format("SELECT [Employee ID] FROM Employees " & "WHERE [Last Name] = '{0}' AND [First Name] = '{1}'", lastName, firstName), connection)
 
                 connection.Open()
                 Try
diff --git a/samples/snippets/visualbasic/VS_Snippets_Remoting/TransactionScope/vb/Project.vbproj b/samples/snippets/visualbasic/VS_Snippets_Remoting/TransactionScope/vb/Project.vbproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/snippets/visualbasic/VS_Snippets_Remoting/TransactionScope/vb/ScopeWithSQL.vb b/samples/snippets/visualbasic/VS_Snippets_Remoting/TransactionScope/vb/ScopeWithSQL.vb
@@ -25,10 +25,10 @@ Module Module1
     End Sub
 
     ' <Snippet1>
-    '  This function takes arguments for 2 connection strings and commands to create a transaction 
-    '  involving two SQL Servers. It returns a value > 0 if the transaction is committed, 0 if the 
-    '  transaction is rolled back. To test this code, you can connect to two different databases 
-    '  on the same server by altering the connection string, or to another 3rd party RDBMS  
+    '  This function takes arguments for 2 connection strings and commands to create a transaction
+    '  involving two SQL Servers. It returns a value > 0 if the transaction is committed, 0 if the
+    '  transaction is rolled back. To test this code, you can connect to two different databases
+    '  on the same server by altering the connection string, or to another 3rd party RDBMS
     '  by altering the code in the connection2 code block.
     Public Function CreateTransactionScope( _
       ByVal connectString1 As String, ByVal connectString2 As String, _
@@ -43,7 +43,7 @@ Module Module1
             '  that both commands can commit or roll back as a single unit of work.
             Using scope As New TransactionScope()
                 Using connection1 As New SqlConnection(connectString1)
-                    ' Opening the connection automatically enlists it in the 
+                    ' Opening the connection automatically enlists it in the
                     ' TransactionScope as a lightweight transaction.
                     connection1.Open()
 
@@ -55,7 +55,7 @@ Module Module1
                     ' If you get here, this means that command1 succeeded. By nesting
                     ' the using block for connection2 inside that of connection1, you
                     ' conserve server and network resources as connection2 is opened
-                    ' only when there is a chance that the transaction can commit.   
+                    ' only when there is a chance that the transaction can commit.
                     Using connection2 As New SqlConnection(connectString2)
                         ' The transaction is escalated to a full distributed
                         ' transaction when connection2 is opened.
@@ -85,15 +85,11 @@ Module Module1
     ' </Snippet1>
 
     Private Function GetSQLConnectionString1() As String
-        ' To avoid storing the connection string in your code,  
-        ' you can retrieve it from a configuration file.
-        Return "Integrated Security=true;database=Northwind;server=(local)"
+        Throw New NotImplementedException()
     End Function
 
     Private Function GetSQLConnectionString2() As String
-        ' To avoid storing the connection string in your code,  
-        ' you can retrieve it from a configuration file.
-        Return "Integrated Security=true;database=AdventureWorks;server=(local)"
+        Throw New NotImplementedException()
     End Function
 
 End Module
diff --git a/samples/snippets/visualbasic/VS_Snippets_VBCSharp/VbVbalrInterop/VB/Class1.vb b/samples/snippets/visualbasic/VS_Snippets_VBCSharp/VbVbalrInterop/VB/Class1.vb
@@ -4,21 +4,18 @@ Option Explicit On
 ' <snippet13>
 Imports System.Runtime.InteropServices
 ' </snippet13>
-Imports System.Diagnostics
-
 Imports System.Windows.Forms
 
 ' <snippet40>
-Imports INKEDLib
 
 Class Sample
-    Private s As IInkCursor
+    'Private s As IInkCursor
 
 End Class
 ' </snippet40>
 
-' Requires a reference to Microsoft DAO 3.6 Object Library 
-' Requires a reference to Microsoft ActiveX Data Objects 2.8 Library 
+' Requires a reference to Microsoft DAO 3.6 Object Library
+' Requires a reference to Microsoft ActiveX Data Objects 2.8 Library
 
 ' Or just use these fake things
 Namespace ADODB
@@ -67,8 +64,6 @@ Namespace DAO
     End Class
 End Namespace
 
-
-
 Class Class27d75f0a54ab4ee1b91d43513a19b12d
     ' 27d75f0a-54ab-4ee1-b91d-43513a19b12d
     ' How to: Call Windows APIs (Visual Basic)
@@ -278,14 +273,12 @@ Class Classb324cc1eb03c4f39aea66a6d5bfd0e37
         Inherits Form
 
         ' <snippet24>
-        ' To use this example, add a reference to the 
-        '     Microsoft ActiveX Data Objects 2.8 Library  
+        ' To use this example, add a reference to the
+        '     Microsoft ActiveX Data Objects 2.8 Library
         ' from the COM tab of the project references page.
         Dim WithEvents cn As New ADODB.Connection
         Sub ADODBConnect()
-            cn.ConnectionString =
-            "Provider=Microsoft.Jet.OLEDB.4.0;" &
-            "Data Source=C:\NWIND.MDB"
+            cn.ConnectionString = "..."
             cn.Open()
             MsgBox(cn.ConnectionString)
         End Sub
@@ -301,7 +294,7 @@ Class Classb324cc1eb03c4f39aea66a6d5bfd0e37
             ByRef adStatus As ADODB.EventStatusEnum,
             ByVal pConnection As ADODB.Connection) Handles cn.ConnectComplete
 
-            '  This is the event handler for the cn_ConnectComplete event raised 
+            '  This is the event handler for the cn_ConnectComplete event raised
             '  by the ADODB.Connection object when a database is opened.
             Dim x As Integer = 6
             Dim y As Integer = 0
diff --git a/samples/snippets/visualbasic/VS_Snippets_VBCSharp/VbVbalrInterop/VB/vbvbalrinterop.vbproj b/samples/snippets/visualbasic/VS_Snippets_VBCSharp/VbVbalrInterop/VB/vbvbalrinterop.vbproj
@@ -1,103 +1,12 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+﻿<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>
-    </ProductVersion>
-    <SchemaVersion>
-    </SchemaVersion>
-    <ProjectGuid>{8007A463-3603-45E0-8AEC-AEB7CEBFF17A}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>VbVbalrInterop</RootNamespace>
-    <AssemblyName>VbVbalrInterop</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>VbVbalrInterop.xml</DocumentationFile>
-    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <DefineDebug>false</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>VbVbalrInterop.xml</DocumentationFile>
-    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionExplicit>On</OptionExplicit>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionCompare>Binary</OptionCompare>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionStrict>Off</OptionStrict>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionInfer>On</OptionInfer>
+    <TargetFrameworks>net4.8</TargetFrameworks>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-  </ItemGroup>
-  <ItemGroup>
-    <Import Include="Microsoft.VisualBasic" />
-    <Import Include="System" />
-    <Import Include="System.Collections" />
-    <Import Include="System.Collections.Generic" />
-    <Import Include="System.Data" />
-    <Import Include="System.Diagnostics" />
-    <Import Include="System.Linq" />
-    <Import Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Class1.vb">
-      <SubType>Form</SubType>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <COMReference Include="INKEDLib">
-      <Guid>{8405D0DF-9FDD-4829-AEAD-8E2B0A18FEA4}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>tlbimp</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="stdole">
-      <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
-      <VersionMajor>2</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="My Project\" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
+
+</Project>
