Skip to content

Commit 5a2492c

Browse files
uc-msftuc-msft
authored
Merge pull request #1348 from LJohnson2484/development
Development
2 parents 7b53cf3 + e5e2a90 commit 5a2492c

9 files changed

Lines changed: 59 additions & 45 deletions

File tree

‎samples/applications/iot-connected-car/App.config‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
55
</startup>
66
<connectionStrings>
7-
<add name="Db" connectionString="Server=tcp:YOUR_SERVER.database.windows.net,1433;Database=ConnectedCar;User ID=YOUR_USERNAME;Password=YOUR_PASSWORD;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;"/>
7+
<add name="Db" connectionString="Server=tcp:YOUR_SERVER.database.windows.net,1433;Database=ConnectedCar;User ID=YOUR_USERNAME;Password=YOUR_PASSWORD;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;" />
88
</connectionStrings>
99
<appSettings>
10-
<add key="insertSPName" value="InsertEvent"/> <!--Stored Procedure Name-->
11-
<add key="numberOfTasks" value="5"/> <!--Number of concurrent async tasks that the Data Generator will use-->
12-
<add key="numberOfCars" value="2500"/> <!--Number of unique cars-->
13-
<add key="batchSize" value="250"/> <!--Row Batch Size that every task produces-->
14-
<add key="commandDelay" value="10"/> <!--Delay between sql commands. You can set this to 0 for max high volume workload-->
15-
<add key="commandTimeout" value="600"/> <!--SQL Command Timeout-->
16-
<add key="enableShock" value="0"/> <!--Flag that turns on/off the data shock. This should be set to 0 for max high volume workload-->
17-
<add key="rpsFrequency" value="1000"/> <!--How frequently the Data Generator Rows Per Second(RPS) is polled-->
18-
<add key="logFileName" value="log.txt"/> <!--Log File Path-->
10+
<add key="insertSPName" value="InsertEvent" /> <!--Stored Procedure Name-->
11+
<add key="numberOfTasks" value="5" /> <!--Number of concurrent async tasks that the Data Generator will use-->
12+
<add key="numberOfCars" value="2500" /> <!--Number of unique cars-->
13+
<add key="batchSize" value="250" /> <!--Row Batch Size that every task produces-->
14+
<add key="commandDelay" value="10" /> <!--Delay between sql commands. You can set this to 0 for max high volume workload-->
15+
<add key="commandTimeout" value="600" /> <!--SQL Command Timeout-->
16+
<add key="enableShock" value="0" /> <!--Flag that turns on/off the data shock. This should be set to 0 for max high volume workload-->
17+
<add key="rpsFrequency" value="1000" /> <!--How frequently the Data Generator Rows Per Second(RPS) is polled-->
18+
<add key="logFileName" value="log.txt" /> <!--Log File Path-->
1919

2020
<!--random number generator settings-->
2121
<add key="HighSpeedProbabilityPower" value="0.5" />

‎samples/applications/iot-connected-car/DataGenerator/DataGenerator.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>DataGenerator</RootNamespace>
1111
<AssemblyName>DataGenerator</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14+
<TargetFrameworkProfile />
1415
</PropertyGroup>
1516
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1617
<DebugSymbols>true</DebugSymbols>

‎samples/applications/iot-connected-car/WinFormsClient/Properties/Resources.Designer.cs‎

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎samples/applications/iot-connected-car/WinFormsClient/Properties/Settings.Designer.cs‎

Lines changed: 9 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎samples/applications/iot-connected-car/WinFormsClient/WinFormsClient.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Client</RootNamespace>
1111
<AssemblyName>Client</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
15+
<TargetFrameworkProfile />
1516
</PropertyGroup>
1617
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1718
<PlatformTarget>AnyCPU</PlatformTarget>

‎samples/databases/wide-world-importers/wwi-app/wwi-app.csproj‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,9 @@
1414
<Content Remove="wwwroot\OData.tt" />
1515
</ItemGroup>
1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.2" />
18-
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.0.3" />
19-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.3" />
20-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.2" />
21-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.1" />
22-
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.0.2" />
17+
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.4.1" />
2318
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.3" />
24-
<PackageReference Include="MsSql.RestApi" Version="0.4.0" />
25-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
19+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2620
</ItemGroup>
2721
<ItemGroup>
2822
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="1.0.1" />

‎samples/databases/wide-world-importers/wwi-azure-functions/wwi-azure-functions.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
<RootNamespace>wwi_azure_functions</RootNamespace>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.22" />
9-
<PackageReference Include="MsSql.RestApi" Version="0.4.0" />
8+
<PackageReference Include="Belgrade.TSql.RestApi" Version="0.9.5" />
109
</ItemGroup>
1110
<ItemGroup>
1211
<None Update="host.json">

‎samples/databases/wide-world-importers/wwi-sample.sln‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "WideWorldImporters", "wwi-s
1111
EndProject
1212
Project("{159641D6-6404-4A2A-AE62-294DE0FE8301}") = "Daily ETL", "wwi-ssis\WWI-SSIS\Daily ETL.dtproj", "{925A4107-F621-4697-955C-1EB222C4AB3C}"
1313
EndProject
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "wwi-app", "wwi-app\wwi-app.csproj", "{6906F917-3781-423C-9B29-A7D1DCE7EE0D}"
15+
EndProject
16+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "wwi-azure-functions", "wwi-azure-functions\wwi-azure-functions.csproj", "{CEFEBC2F-1BF5-452C-89FF-9BD1892D5DA6}"
17+
EndProject
1418
Global
1519
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1620
Debug|Any CPU = Debug|Any CPU
@@ -51,6 +55,18 @@ Global
5155
{925A4107-F621-4697-955C-1EB222C4AB3C}.Development|Any CPU.Build.0 = Development
5256
{925A4107-F621-4697-955C-1EB222C4AB3C}.Release|Any CPU.ActiveCfg = Development
5357
{925A4107-F621-4697-955C-1EB222C4AB3C}.Release|Any CPU.Build.0 = Development
58+
{6906F917-3781-423C-9B29-A7D1DCE7EE0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
59+
{6906F917-3781-423C-9B29-A7D1DCE7EE0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
60+
{6906F917-3781-423C-9B29-A7D1DCE7EE0D}.Development|Any CPU.ActiveCfg = Debug|Any CPU
61+
{6906F917-3781-423C-9B29-A7D1DCE7EE0D}.Development|Any CPU.Build.0 = Debug|Any CPU
62+
{6906F917-3781-423C-9B29-A7D1DCE7EE0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
63+
{6906F917-3781-423C-9B29-A7D1DCE7EE0D}.Release|Any CPU.Build.0 = Release|Any CPU
64+
{CEFEBC2F-1BF5-452C-89FF-9BD1892D5DA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
65+
{CEFEBC2F-1BF5-452C-89FF-9BD1892D5DA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
66+
{CEFEBC2F-1BF5-452C-89FF-9BD1892D5DA6}.Development|Any CPU.ActiveCfg = Debug|Any CPU
67+
{CEFEBC2F-1BF5-452C-89FF-9BD1892D5DA6}.Development|Any CPU.Build.0 = Debug|Any CPU
68+
{CEFEBC2F-1BF5-452C-89FF-9BD1892D5DA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
69+
{CEFEBC2F-1BF5-452C-89FF-9BD1892D5DA6}.Release|Any CPU.Build.0 = Release|Any CPU
5470
EndGlobalSection
5571
GlobalSection(SolutionProperties) = preSolution
5672
HideSolutionNode = FALSE

‎sql-server-samples.code-workspace‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"folders": [
3+
{
4+
"path": "."
5+
}
6+
]
7+
}

0 commit comments

Comments
 (0)