Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development #1348

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Development #1348

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ecb4469
WWI-Development-VS-Code
LJohnson2484 Sep 30, 2024
1afc006
VS Code & Visual Studio 2022 updates
LJohnson2484 Oct 2, 2024
f66dcf8
NuGet package deprecation removals and update version installs
LJohnson2484 Oct 2, 2024
fbf0adb
Update App.config
LJohnson2484 Oct 2, 2024
e5e2a90
Adding workspace file to be able to load in both VS Code & Visual Stu…
LJohnson2484 Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions samples/applications/iot-connected-car/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
<connectionStrings>
<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;"/>
<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;" />
</connectionStrings>
<appSettings>
<add key="insertSPName" value="InsertEvent"/> <!--Stored Procedure Name-->
<add key="numberOfTasks" value="5"/> <!--Number of concurrent async tasks that the Data Generator will use-->
<add key="numberOfCars" value="2500"/> <!--Number of unique cars-->
<add key="batchSize" value="250"/> <!--Row Batch Size that every task produces-->
<add key="commandDelay" value="10"/> <!--Delay between sql commands. You can set this to 0 for max high volume workload-->
<add key="commandTimeout" value="600"/> <!--SQL Command Timeout-->
<add key="enableShock" value="0"/> <!--Flag that turns on/off the data shock. This should be set to 0 for max high volume workload-->
<add key="rpsFrequency" value="1000"/> <!--How frequently the Data Generator Rows Per Second(RPS) is polled-->
<add key="logFileName" value="log.txt"/> <!--Log File Path-->
<add key="insertSPName" value="InsertEvent" /> <!--Stored Procedure Name-->
<add key="numberOfTasks" value="5" /> <!--Number of concurrent async tasks that the Data Generator will use-->
<add key="numberOfCars" value="2500" /> <!--Number of unique cars-->
<add key="batchSize" value="250" /> <!--Row Batch Size that every task produces-->
<add key="commandDelay" value="10" /> <!--Delay between sql commands. You can set this to 0 for max high volume workload-->
<add key="commandTimeout" value="600" /> <!--SQL Command Timeout-->
<add key="enableShock" value="0" /> <!--Flag that turns on/off the data shock. This should be set to 0 for max high volume workload-->
<add key="rpsFrequency" value="1000" /> <!--How frequently the Data Generator Rows Per Second(RPS) is polled-->
<add key="logFileName" value="log.txt" /> <!--Log File Path-->

<!--random number generator settings-->
<add key="HighSpeedProbabilityPower" value="0.5" />
Expand Down
3 changes: 2 additions & 1 deletion samples/applications/iot-connected-car/DataGenerator/DataGenerator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DataGenerator</RootNamespace>
<AssemblyName>DataGenerator</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down
16 changes: 8 additions & 8 deletions samples/applications/iot-connected-car/WinFormsClient/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 9 additions & 13 deletions samples/applications/iot-connected-car/WinFormsClient/Properties/Settings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion samples/applications/iot-connected-car/WinFormsClient/WinFormsClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Client</RootNamespace>
<AssemblyName>Client</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand Down
10 changes: 2 additions & 8 deletions samples/databases/wide-world-importers/wwi-app/wwi-app.csproj
View file
Open in desktop
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should get any package deprecation issues resolved and allow Visual Studio 2022 to be satisfied with the build dependencies with the latest available packages.

Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,9 @@
<Content Remove="wwwroot\OData.tt" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.0.3" />
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These packages are subject to change based off availability. ]

<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.3" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.1" />
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.0.2" />
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.4.1" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.3" />
<PackageReference Include="MsSql.RestApi" Version="0.4.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="1.0.1" />
Expand Down
3 changes: 1 addition & 2 deletions samples/databases/wide-world-importers/wwi-azure-functions/wwi-azure-functions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
<RootNamespace>wwi_azure_functions</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.22" />
<PackageReference Include="MsSql.RestApi" Version="0.4.0" />
<PackageReference Include="Belgrade.TSql.RestApi" Version="0.9.5" />
</ItemGroup>
<ItemGroup>
<None Update="host.json">
Expand Down
16 changes: 16 additions & 0 deletions samples/databases/wide-world-importers/wwi-sample.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "WideWorldImporters", "wwi-s
EndProject
Project("{159641D6-6404-4A2A-AE62-294DE0FE8301}") = "Daily ETL", "wwi-ssis\WWI-SSIS\Daily ETL.dtproj", "{925A4107-F621-4697-955C-1EB222C4AB3C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "wwi-app", "wwi-app\wwi-app.csproj", "{6906F917-3781-423C-9B29-A7D1DCE7EE0D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "wwi-azure-functions", "wwi-azure-functions\wwi-azure-functions.csproj", "{CEFEBC2F-1BF5-452C-89FF-9BD1892D5DA6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -51,6 +55,18 @@ Global
{925A4107-F621-4697-955C-1EB222C4AB3C}.Development|Any CPU.Build.0 = Development
{925A4107-F621-4697-955C-1EB222C4AB3C}.Release|Any CPU.ActiveCfg = Development
{925A4107-F621-4697-955C-1EB222C4AB3C}.Release|Any CPU.Build.0 = Development
{6906F917-3781-423C-9B29-A7D1DCE7EE0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6906F917-3781-423C-9B29-A7D1DCE7EE0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6906F917-3781-423C-9B29-A7D1DCE7EE0D}.Development|Any CPU.ActiveCfg = Debug|Any CPU
{6906F917-3781-423C-9B29-A7D1DCE7EE0D}.Development|Any CPU.Build.0 = Debug|Any CPU
{6906F917-3781-423C-9B29-A7D1DCE7EE0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6906F917-3781-423C-9B29-A7D1DCE7EE0D}.Release|Any CPU.Build.0 = Release|Any CPU
{CEFEBC2F-1BF5-452C-89FF-9BD1892D5DA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CEFEBC2F-1BF5-452C-89FF-9BD1892D5DA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CEFEBC2F-1BF5-452C-89FF-9BD1892D5DA6}.Development|Any CPU.ActiveCfg = Debug|Any CPU
{CEFEBC2F-1BF5-452C-89FF-9BD1892D5DA6}.Development|Any CPU.Build.0 = Debug|Any CPU
{CEFEBC2F-1BF5-452C-89FF-9BD1892D5DA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CEFEBC2F-1BF5-452C-89FF-9BD1892D5DA6}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down