Skip to content

Commit

Permalink
Merge pull request #73 from takenet/feature/test-console-upgrade-net6
Browse files Browse the repository at this point in the history
feat: Migrate Lime Test Console to .Net6
  • Loading branch information
ejstake authored Jun 20, 2023
2 parents 5c5c4f4 + 2332ffb commit c0b4283
Show file tree
Hide file tree
Showing 19 changed files with 981 additions and 7,529 deletions.

Large diffs are not rendered by default.

6,952 changes: 0 additions & 6,952 deletions src/Lime.Client.TestConsole.Setup/Lime.Client.TestConsole.Setup.vdproj

This file was deleted.

26 changes: 0 additions & 26 deletions src/Lime.Client.TestConsole/App.config

This file was deleted.

4 changes: 1 addition & 3 deletions src/Lime.Client.TestConsole/FileUtil.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
using System.Globalization;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Newtonsoft.Json;

namespace Lime.Client.TestConsole
Expand Down Expand Up @@ -89,7 +87,7 @@ public static void SaveFile(object content, string fileName)
File.WriteAllText(fileName, stringContent);
}

private static string GetAppDataFileName(string fileName)
internal static string GetAppDataFileName(string fileName)
{
var appDataFolder = Path.Combine(Environment.GetFolderPath(
Environment.SpecialFolder.ApplicationData),
Expand Down
302 changes: 41 additions & 261 deletions src/Lime.Client.TestConsole/Lime.Client.TestConsole.csproj
Original file line number Diff line number Diff line change
@@ -1,284 +1,64 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{9E13148D-726D-4E42-B924-4A1AF4F0DC3E}</ProjectGuid>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Lime.Client.TestConsole</RootNamespace>
<AssemblyName>Lime.Client.TestConsole</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<IsWebBootstrapper>false</IsWebBootstrapper>
<TargetFrameworkProfile />
<PublishUrl>\\smc2.takenet.com.br\Departamentos\Tecnologia\Binarios\Plataformas\Iris\Lime.Client.TestConsole\</PublishUrl>
<Install>true</Install>
<InstallFrom>Unc</InstallFrom>
<UpdateEnabled>true</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<InstallUrl>\\smc2.takenet.com.br\Departamentos\Tecnologia\Binarios\Plataformas\Iris\Lime.Client.TestConsole\</InstallUrl>
<ProductName>Lime Test Console</ProductName>
<PublisherName>Take.net</PublisherName>
<SuiteName>Lime</SuiteName>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>index.html</WebPage>
<OpenBrowserOnPublish>false</OpenBrowserOnPublish>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.11.15.0</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TargetFramework>net6.0-windows</TargetFramework>
<OutputType>WinExe</OutputType>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<IsWebBootstrapper>false</IsWebBootstrapper>
<Install>true</Install>
<ProductName>Lime Test Console</ProductName>
<PublisherName>Blip</PublisherName>
<SuiteName>Lime</SuiteName>
<VersionPrefix>2.0.0.0</VersionPrefix>
<UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>
<GenerateAssemblyInfo>True</GenerateAssemblyInfo>
<UseWPF>true</UseWPF>
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
</PropertyGroup>
<PropertyGroup>
<ManifestCertificateThumbprint>E9FC58BA8181DBF8AC4AD49E163A78C7C051BF92</ManifestCertificateThumbprint>
<ManifestCertificateThumbprint>E9FC58BA8181DBF8AC4AD49E163A78C7C051BF92</ManifestCertificateThumbprint>
</PropertyGroup>
<PropertyGroup>
<ManifestKeyFile>Lime.Client.TestConsole_TemporaryKey.pfx</ManifestKeyFile>
<ManifestKeyFile>Lime.Client.TestConsole_TemporaryKey.pfx</ManifestKeyFile>
</PropertyGroup>
<PropertyGroup>
<GenerateManifests>true</GenerateManifests>
<GenerateManifests>true</GenerateManifests>
</PropertyGroup>
<PropertyGroup>
<SignManifests>false</SignManifests>
<SignManifests>false</SignManifests>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>lime.ico</ApplicationIcon>
<ApplicationIcon>lime.ico</ApplicationIcon>
<Title>LIME Test Console</Title>
<Company>$(PublisherName)</Company>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Net" />
<Reference Include="System.Runtime.Caching" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" />
<Reference Include="System.Web" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
</ItemGroup>
<ItemGroup>
<ApplicationDefinition Include="App.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Compile Include="Converters\ToStringConverter.cs" />
<Compile Include="Converters\IsRawToBrushConverter.cs" />
<Compile Include="Converters\IsErrorToBrushConverter.cs" />
<Compile Include="Converters\DataOperationToBrushConverter.cs" />
<Compile Include="FileUtil.cs" />
<Compile Include="Macros\ApplyTransportOptionsMacro.cs" />
<Compile Include="Macros\CleanGuestIdentityMacro.cs" />
<Compile Include="Macros\MacroAttribute.cs" />
<Compile Include="Macros\NotifyMessageConsumedMacro.cs" />
<Compile Include="Macros\ReplyPingMacro.cs" />
<Compile Include="Macros\NotifyMessageReceivedMacro.cs" />
<Compile Include="Macros\SendAuthenticatingExternalMacro.cs" />
<Compile Include="Macros\SendAuthenticatingKeyMacro.cs" />
<Compile Include="Macros\SendAuthenticatingMacroBase.cs" />
<Compile Include="Macros\SendAuthenticatingGuestMacro.cs" />
<Compile Include="Macros\SendAuthenticatingPlainMacro.cs" />
<Compile Include="Macros\SendAuthenticatingTransportMacro.cs" />
<Compile Include="Macros\SendNegotiatingNoneTlsMacro.cs" />
<Compile Include="Macros\SendNegotiatingNoneNoneMacro.cs" />
<Compile Include="Macros\SendTemplateMacroBase.cs" />
<Compile Include="Macros\SetDomainMacro.cs" />
<Compile Include="Macros\SetGuestIdentityMacro.cs" />
<Compile Include="Macros\SetLocalNodeMacro.cs" />
<Compile Include="Macros\SetNotificationEvent.cs" />
<Compile Include="Macros\SendSetPresenceAvailableIdentityMacro.cs" />
<Compile Include="Macros\SendSetPresenceAvailableMacro.cs" />
<Compile Include="Macros\SetSessionDataMacro.cs" />
<Compile Include="Macros\SetSessionIdMacro.cs" />
<Compile Include="Macros\CloseTransportMacro.cs" />
<Compile Include="Macros\IMacro.cs" />
<Compile Include="Mvvm\AsyncCommand.cs" />
<Compile Include="Mvvm\ObservableCollectionEx.cs" />
<Compile Include="ValidationRules\JsonEnvelopeValidationRule.cs" />
<Compile Include="ViewModels\EnvelopeViewModel.cs" />
<Compile Include="ViewModels\MacroViewModel.cs" />
<Compile Include="ViewModels\MainViewModel.cs" />
<Compile Include="ViewModels\ProfileViewModel.cs" />
<Compile Include="ViewModels\SessionViewModel.cs" />
<Compile Include="ViewModels\StatusMessageViewModel.cs" />
<Compile Include="ViewModels\TemplateViewModel.cs" />
<Compile Include="ViewModels\VariableViewModel.cs" />
<Compile Include="Views\EnvelopeView.xaml.cs">
<DependentUpon>EnvelopeView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\SessionView.xaml.cs">
<DependentUpon>SessionView.xaml</DependentUpon>
</Compile>
<Page Include="Converters\Converters.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="DesignData\EnvelopeDesignData.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="DesignData\SessionDesignData.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="DesignData\MainDesignData.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="MainWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="MainWindow.xaml.cs">
<DependentUpon>MainWindow.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Page Include="Views\ApplicationResourcesDictionary.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\EnvelopeView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\SessionView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="Commands.json" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<AppDesigner Include="Properties\" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.5.1">
<Visible>False</Visible>
<ProductName>Microsoft .NET Framework 4.5.1 %28x86 and x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<Content Include="Templates.txt" />
<AppDesigner Include="Properties\" />
</ItemGroup>
<ItemGroup>
<Content Include="Variables.txt" />
<Content Include="Templates.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<Resource Include="lime.ico" />
<Content Include="Variables.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<Folder Include="Utils\" />
<Resource Include="lime.ico" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Extended.Wpf.Toolkit">
<Version>2.2.0</Version>
</PackageReference>
<PackageReference Include="Lime.Messaging">
<Version>0.8.114-beta</Version>
</PackageReference>
<PackageReference Include="Lime.Transport.Tcp">
<Version>0.8.114-beta</Version>
</PackageReference>
<PackageReference Include="Lime.Transport.WebSocket">
<Version>0.8.114-beta</Version>
</PackageReference>
<PackageReference Include="Microsoft.Tpl.Dataflow">
<Version>4.5.24</Version>
</PackageReference>
<PackageReference Include="MvvmLightLibs">
<Version>4.4.32.7</Version>
</PackageReference>
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.0" />
<PackageReference Include="Extended.Wpf.Toolkit" Version="4.5.0" />
<PackageReference Include="Lime.Messaging" Version="0.12.45" />
<PackageReference Include="Lime.Transport.Tcp" Version="0.12.45" />
<PackageReference Include="Lime.Transport.WebSocket" Version="0.12.45" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="System.Runtime.Caching" Version="7.0.0" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="6.0.0" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
</Target>
<!-- 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>
2 changes: 1 addition & 1 deletion src/Lime.Client.TestConsole/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
xmlns:vw="clr-namespace:Lime.Client.TestConsole.Views"
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
mc:Ignorable="d"
DataContext="{StaticResource MainViewModel}"
d:DataContext="{d:DesignData /DesignData/MainDesignData.xaml}"
Expand Down
Loading

0 comments on commit c0b4283

Please sign in to comment.