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

Jump to bottom

Change emulator to net6.0 #1682

Merged
merged 3 commits into from
Sep 20, 2022
Merged

Change emulator to net6.0 #1682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ab4ab6
Change emulator to net6.0
vicancy Sep 20, 2022
b1d2e97
Fix test
vicancy Sep 20, 2022
3085828
Merge branch 'dev' into e6
vicancy Sep 20, 2022
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
2 changes: 1 addition & 1 deletion build/dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<!--Emulator -->
<MicrosoftExtensionsCommandLineUtilsPackageVersion>1.1.1</MicrosoftExtensionsCommandLineUtilsPackageVersion>
<SystemIOPipelinesPackageForEmulatorVersion>4.7.5</SystemIOPipelinesPackageForEmulatorVersion>
<EmulatorMicrosoftPackageVersion>3.1.24</EmulatorMicrosoftPackageVersion>
<EmulatorMicrosoftPackageVersion>6.0.9</EmulatorMicrosoftPackageVersion>

<!--Testing -->
<MessagePackPackage3_1Version>1.9.11</MessagePackPackage3_1Version>
Expand Down
3 changes: 1 addition & 2 deletions src/Microsoft.Azure.SignalR.Emulator/Microsoft.Azure.SignalR.Emulator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>

<PackAsTool>true</PackAsTool>
<ToolCommandName>asrs-emulator</ToolCommandName>
Expand All @@ -13,7 +13,6 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="$(EmulatorMicrosoftPackageVersion)" />
<PackageReference Include="MessagePack" Version="$(MessagePackPackage3_1Version)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="$(EmulatorMicrosoftPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(EmulatorMicrosoftPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="$(MicrosoftExtensionsCommandLineUtilsPackageVersion)" />
Expand Down
4 changes: 3 additions & 1 deletion src/Microsoft.Azure.SignalR.Emulator/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ The Azure SignalR Emulator was successfully started.

Press Ctrl+C to stop the Emulator.

Use the below value inside *********** block as its ConnectionString:
TIPS: Use the below value inside *********** block as its ConnectionString:


***********

Endpoint={address.Scheme}://{address.Host};Port={address.Port};AccessKey={AppBuilderExtensions.AccessKey};Version=1.0;
Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.Azure.SignalR.Emulator.Tests/Microsoft.Azure.SignalR.Emulator.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down