Browse Source

Fix projects

release/3.x.x
Christian Kratky 6 years ago
parent
commit
1cbec27b7f
8 changed files with 45 additions and 8 deletions
  1. +1
    -1
      Extensions/MQTTnet.Extensions.Rpc/MQTTnet.Extensions.Rpc.csproj
  2. +1
    -1
      Frameworks/MQTTnet.AspnetCore/MQTTnet.AspnetCore.csproj
  3. +2
    -2
      MQTTnet.sln
  4. +1
    -1
      Tests/MQTTnet.Benchmarks/MQTTnet.Benchmarks.csproj
  5. +1
    -1
      Tests/MQTTnet.Core.Tests/MQTTnet.Core.Tests.csproj
  6. +1
    -1
      Tests/MQTTnet.TestApp.NetCore/MQTTnet.TestApp.NetCore.csproj
  7. +30
    -1
      Tests/MQTTnet.TestApp.UniversalWindows/MainPage.xaml
  8. +8
    -0
      Tests/MQTTnet.TestApp.UniversalWindows/MainPage.xaml.cs

+ 1
- 1
Extensions/MQTTnet.Extensions.Rpc/MQTTnet.Extensions.Rpc.csproj View File

@@ -25,7 +25,7 @@
</PropertyGroup> </PropertyGroup>


<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\Frameworks\MQTTnet.Netstandard\MQTTnet.NetStandard.csproj" />
<ProjectReference Include="..\..\Frameworks\MQTTnet.NetStandard\MQTTnet.NetStandard.csproj" />
</ItemGroup> </ItemGroup>


</Project> </Project>

+ 1
- 1
Frameworks/MQTTnet.AspnetCore/MQTTnet.AspnetCore.csproj View File

@@ -22,7 +22,7 @@
</ItemGroup> </ItemGroup>


<ItemGroup> <ItemGroup>
<ProjectReference Include="..\MQTTnet.Netstandard\MQTTnet.NetStandard.csproj" />
<ProjectReference Include="..\MQTTnet.NetStandard\MQTTnet.NetStandard.csproj" />
</ItemGroup> </ItemGroup>


</Project> </Project>

+ 2
- 2
MQTTnet.sln View File

@@ -11,7 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Frameworks", "Frameworks",
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MQTTnet.TestApp.UniversalWindows", "Tests\MQTTnet.TestApp.UniversalWindows\MQTTnet.TestApp.UniversalWindows.csproj", "{FF1F72D6-9524-4422-9497-3CC0002216ED}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MQTTnet.TestApp.UniversalWindows", "Tests\MQTTnet.TestApp.UniversalWindows\MQTTnet.TestApp.UniversalWindows.csproj", "{FF1F72D6-9524-4422-9497-3CC0002216ED}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.NetStandard", "Frameworks\MQTTnet.NetStandard\MQTTnet.Netstandard.csproj", "{3587E506-55A2-4EB3-99C7-DC01E42D25D2}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.NetStandard", "Frameworks\MQTTnet.NetStandard\MQTTnet.NetStandard.csproj", "{3587E506-55A2-4EB3-99C7-DC01E42D25D2}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{67C28AC1-BC3A-420A-BE9C-FA2401431CF9}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{67C28AC1-BC3A-420A-BE9C-FA2401431CF9}"
ProjectSection(SolutionItems) = preProject ProjectSection(SolutionItems) = preProject
@@ -38,7 +38,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions",
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Extensions.Rpc", "Extensions\MQTTnet.Extensions.Rpc\MQTTnet.Extensions.Rpc.csproj", "{C444E9C8-95FA-430E-9126-274129DE16CD}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Extensions.Rpc", "Extensions\MQTTnet.Extensions.Rpc\MQTTnet.Extensions.Rpc.csproj", "{C444E9C8-95FA-430E-9126-274129DE16CD}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MQTTnet.Benchmarks", "Tests\MQTTnet.Benchmarks\MQTTnet.Benchmarks.csproj", "{998D04DD-7CB0-45F5-A393-E2495C16399E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Benchmarks", "Tests\MQTTnet.Benchmarks\MQTTnet.Benchmarks.csproj", "{998D04DD-7CB0-45F5-A393-E2495C16399E}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution


+ 1
- 1
Tests/MQTTnet.Benchmarks/MQTTnet.Benchmarks.csproj View File

@@ -11,7 +11,7 @@
</ItemGroup> </ItemGroup>


<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\Frameworks\MQTTnet.Netstandard\MQTTnet.NetStandard.csproj" />
<ProjectReference Include="..\..\Frameworks\MQTTnet.NetStandard\MQTTnet.NetStandard.csproj" />
</ItemGroup> </ItemGroup>


</Project> </Project>

+ 1
- 1
Tests/MQTTnet.Core.Tests/MQTTnet.Core.Tests.csproj View File

@@ -13,7 +13,7 @@
</ItemGroup> </ItemGroup>


<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\Frameworks\MQTTnet.Netstandard\MQTTnet.NetStandard.csproj" />
<ProjectReference Include="..\..\Frameworks\MQTTnet.NetStandard\MQTTnet.NetStandard.csproj" />
</ItemGroup> </ItemGroup>


</Project> </Project>

+ 1
- 1
Tests/MQTTnet.TestApp.NetCore/MQTTnet.TestApp.NetCore.csproj View File

@@ -15,7 +15,7 @@
</ItemGroup> </ItemGroup>


<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\Frameworks\MQTTnet.Netstandard\MQTTnet.NetStandard.csproj" />
<ProjectReference Include="..\..\Frameworks\MQTTnet.NetStandard\MQTTnet.NetStandard.csproj" />
</ItemGroup> </ItemGroup>


</Project> </Project>

+ 30
- 1
Tests/MQTTnet.TestApp.UniversalWindows/MainPage.xaml View File

@@ -43,8 +43,8 @@
<Button Click="Disconnect" Width="120">Disconnect</Button> <Button Click="Disconnect" Width="120">Disconnect</Button>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>

</PivotItem> </PivotItem>

<PivotItem Header="Publish"> <PivotItem Header="Publish">
<StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> <StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<TextBlock>Topic:</TextBlock> <TextBlock>Topic:</TextBlock>
@@ -69,6 +69,7 @@
<Button Click="Publish" Width="120">Publish</Button> <Button Click="Publish" Width="120">Publish</Button>
</StackPanel> </StackPanel>
</PivotItem> </PivotItem>

<PivotItem Header="Execute RPC"> <PivotItem Header="Execute RPC">
<StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> <StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<TextBlock>Method:</TextBlock> <TextBlock>Method:</TextBlock>
@@ -103,6 +104,7 @@
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</PivotItem> </PivotItem>

<PivotItem Header="Subscribe"> <PivotItem Header="Subscribe">
<StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> <StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<TextBlock>Topic:</TextBlock> <TextBlock>Topic:</TextBlock>
@@ -132,6 +134,7 @@
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</PivotItem> </PivotItem>

<PivotItem Header="Server"> <PivotItem Header="Server">
<StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> <StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<TextBlock>Port:</TextBlock> <TextBlock>Port:</TextBlock>
@@ -151,6 +154,31 @@
<Button Click="ClearLog" Width="120">Clear</Button> <Button Click="ClearLog" Width="120">Clear</Button>
</StackPanel> </StackPanel>
</PivotItem> </PivotItem>

<PivotItem Header="Sessions">
<StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<StackPanel Orientation="Horizontal">
<Button Width="120" Margin="0,0,10,0" Click="RefreshSessions">Refresh</Button>
<Button Width="120" Margin="0,0,10,0" Click="ClearSessions">Clear</Button>
</StackPanel>

<ListView>
<ListView.ItemTemplate>
<DataTemplate>
<Grid>
<TextBlock></TextBlock>
</Grid>
</DataTemplate>
</ListView.ItemTemplate>
</ListView>

</StackPanel>
</PivotItem>
<PivotItem Header="Log">
<StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<Button Click="ClearLog" Width="120">Clear</Button>
</StackPanel>
</PivotItem>
</Pivot> </Pivot>


<ScrollViewer Grid.Row="1" Margin="12,10,12,0" Background="Black" Foreground="WhiteSmoke" FontFamily="Consolas" HorizontalScrollMode="Enabled" VerticalScrollMode="Enabled" HorizontalScrollBarVisibility="Visible" VerticalScrollBarVisibility="Visible"> <ScrollViewer Grid.Row="1" Margin="12,10,12,0" Background="Black" Foreground="WhiteSmoke" FontFamily="Consolas" HorizontalScrollMode="Enabled" VerticalScrollMode="Enabled" HorizontalScrollBarVisibility="Visible" VerticalScrollBarVisibility="Visible">
@@ -159,3 +187,4 @@
</Grid> </Grid>


</Page> </Page>


+ 8
- 0
Tests/MQTTnet.TestApp.UniversalWindows/MainPage.xaml.cs View File

@@ -372,6 +372,14 @@ namespace MQTTnet.TestApp.UniversalWindows
RpcResponses.Items.Clear(); RpcResponses.Items.Clear();
} }


private void ClearSessions(object sender, RoutedEventArgs e)
{
}

private void RefreshSessions(object sender, RoutedEventArgs e)
{
}

private async Task WikiCode() private async Task WikiCode()
{ {
{ {


Loading…
Cancel
Save