Skip to content

Commit 3e0e465

Browse files
johanlindforsjohanlindfors
committed
Fixes for demos preparing for SweTugg
1 parent 1f6e41a commit 3e0e465

19 files changed

+608
-45
lines changed

‎Demonstrations.sln

Lines changed: 37 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.28010.2046
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.28527.54
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppWinRT", "CppWinRT\CppWinRT.vcxproj", "{FDCD46E6-2DE7-406C-855F-0FE9114D1765}"
77
EndProject
@@ -15,7 +15,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebView.WPF", "WebView.WPF\
1515
EndProject
1616
Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "Demonstrations.MSIX", "Demonstrations.MSIX\Demonstrations.MSIX.wapproj", "{1C50514A-80FC-4246-B7C8-05EEA00C54DA}"
1717
EndProject
18-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetCore.WPF", "DotNetCore.WPF\DotNetCore.WPF.csproj", "{3F5F99D9-AA79-4D82-89C7-3DD4D2405C70}"
18+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetCore.WinForms", "DotNetCore.WinForms\DotNetCore.WinForms.csproj", "{500986D0-9118-400D-A22B-3526FA38D5CD}"
19+
EndProject
20+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetCore.WPF", "DotNetCore.WPF\DotNetCore.WPF.csproj", "{8F3A8261-C59F-46C9-8325-AB7794422DBE}"
1921
EndProject
2022
Global
2123
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -133,22 +135,38 @@ Global
133135
{1C50514A-80FC-4246-B7C8-05EEA00C54DA}.Release|x86.ActiveCfg = Release|x86
134136
{1C50514A-80FC-4246-B7C8-05EEA00C54DA}.Release|x86.Build.0 = Release|x86
135137
{1C50514A-80FC-4246-B7C8-05EEA00C54DA}.Release|x86.Deploy.0 = Release|x86
136-
{3F5F99D9-AA79-4D82-89C7-3DD4D2405C70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
137-
{3F5F99D9-AA79-4D82-89C7-3DD4D2405C70}.Debug|Any CPU.Build.0 = Debug|Any CPU
138-
{3F5F99D9-AA79-4D82-89C7-3DD4D2405C70}.Debug|ARM.ActiveCfg = Debug|Any CPU
139-
{3F5F99D9-AA79-4D82-89C7-3DD4D2405C70}.Debug|ARM.Build.0 = Debug|Any CPU
140-
{3F5F99D9-AA79-4D82-89C7-3DD4D2405C70}.Debug|x64.ActiveCfg = Debug|Any CPU
141-
{3F5F99D9-AA79-4D82-89C7-3DD4D2405C70}.Debug|x64.Build.0 = Debug|Any CPU
142-
{3F5F99D9-AA79-4D82-89C7-3DD4D2405C70}.Debug|x86.ActiveCfg = Debug|Any CPU
143-
{3F5F99D9-AA79-4D82-89C7-3DD4D2405C70}.Debug|x86.Build.0 = Debug|Any CPU
144-
{3F5F99D9-AA79-4D82-89C7-3DD4D2405C70}.Release|Any CPU.ActiveCfg = Release|Any CPU
145-
{3F5F99D9-AA79-4D82-89C7-3DD4D2405C70}.Release|Any CPU.Build.0 = Release|Any CPU
146-
{3F5F99D9-AA79-4D82-89C7-3DD4D2405C70}.Release|ARM.ActiveCfg = Release|Any CPU
147-
{3F5F99D9-AA79-4D82-89C7-3DD4D2405C70}.Release|ARM.Build.0 = Release|Any CPU
148-
{3F5F99D9-AA79-4D82-89C7-3DD4D2405C70}.Release|x64.ActiveCfg = Release|Any CPU
149-
{3F5F99D9-AA79-4D82-89C7-3DD4D2405C70}.Release|x64.Build.0 = Release|Any CPU
150-
{3F5F99D9-AA79-4D82-89C7-3DD4D2405C70}.Release|x86.ActiveCfg = Release|Any CPU
151-
{3F5F99D9-AA79-4D82-89C7-3DD4D2405C70}.Release|x86.Build.0 = Release|Any CPU
138+
{500986D0-9118-400D-A22B-3526FA38D5CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
139+
{500986D0-9118-400D-A22B-3526FA38D5CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
140+
{500986D0-9118-400D-A22B-3526FA38D5CD}.Debug|ARM.ActiveCfg = Debug|Any CPU
141+
{500986D0-9118-400D-A22B-3526FA38D5CD}.Debug|ARM.Build.0 = Debug|Any CPU
142+
{500986D0-9118-400D-A22B-3526FA38D5CD}.Debug|x64.ActiveCfg = Debug|Any CPU
143+
{500986D0-9118-400D-A22B-3526FA38D5CD}.Debug|x64.Build.0 = Debug|Any CPU
144+
{500986D0-9118-400D-A22B-3526FA38D5CD}.Debug|x86.ActiveCfg = Debug|Any CPU
145+
{500986D0-9118-400D-A22B-3526FA38D5CD}.Debug|x86.Build.0 = Debug|Any CPU
146+
{500986D0-9118-400D-A22B-3526FA38D5CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
147+
{500986D0-9118-400D-A22B-3526FA38D5CD}.Release|Any CPU.Build.0 = Release|Any CPU
148+
{500986D0-9118-400D-A22B-3526FA38D5CD}.Release|ARM.ActiveCfg = Release|Any CPU
149+
{500986D0-9118-400D-A22B-3526FA38D5CD}.Release|ARM.Build.0 = Release|Any CPU
150+
{500986D0-9118-400D-A22B-3526FA38D5CD}.Release|x64.ActiveCfg = Release|Any CPU
151+
{500986D0-9118-400D-A22B-3526FA38D5CD}.Release|x64.Build.0 = Release|Any CPU
152+
{500986D0-9118-400D-A22B-3526FA38D5CD}.Release|x86.ActiveCfg = Release|Any CPU
153+
{500986D0-9118-400D-A22B-3526FA38D5CD}.Release|x86.Build.0 = Release|Any CPU
154+
{8F3A8261-C59F-46C9-8325-AB7794422DBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
155+
{8F3A8261-C59F-46C9-8325-AB7794422DBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
156+
{8F3A8261-C59F-46C9-8325-AB7794422DBE}.Debug|ARM.ActiveCfg = Debug|Any CPU
157+
{8F3A8261-C59F-46C9-8325-AB7794422DBE}.Debug|ARM.Build.0 = Debug|Any CPU
158+
{8F3A8261-C59F-46C9-8325-AB7794422DBE}.Debug|x64.ActiveCfg = Debug|Any CPU
159+
{8F3A8261-C59F-46C9-8325-AB7794422DBE}.Debug|x64.Build.0 = Debug|Any CPU
160+
{8F3A8261-C59F-46C9-8325-AB7794422DBE}.Debug|x86.ActiveCfg = Debug|Any CPU
161+
{8F3A8261-C59F-46C9-8325-AB7794422DBE}.Debug|x86.Build.0 = Debug|Any CPU
162+
{8F3A8261-C59F-46C9-8325-AB7794422DBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
163+
{8F3A8261-C59F-46C9-8325-AB7794422DBE}.Release|Any CPU.Build.0 = Release|Any CPU
164+
{8F3A8261-C59F-46C9-8325-AB7794422DBE}.Release|ARM.ActiveCfg = Release|Any CPU
165+
{8F3A8261-C59F-46C9-8325-AB7794422DBE}.Release|ARM.Build.0 = Release|Any CPU
166+
{8F3A8261-C59F-46C9-8325-AB7794422DBE}.Release|x64.ActiveCfg = Release|Any CPU
167+
{8F3A8261-C59F-46C9-8325-AB7794422DBE}.Release|x64.Build.0 = Release|Any CPU
168+
{8F3A8261-C59F-46C9-8325-AB7794422DBE}.Release|x86.ActiveCfg = Release|Any CPU
169+
{8F3A8261-C59F-46C9-8325-AB7794422DBE}.Release|x86.Build.0 = Release|Any CPU
152170
EndGlobalSection
153171
GlobalSection(SolutionProperties) = preSolution
154172
HideSolutionNode = FALSE

‎DotNetCore.WPF/DotNetCore.WPF.csproj

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Wpf">
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
55
<TargetFramework>netcoreapp3.0</TargetFramework>
6+
<UseWPF>true</UseWPF>
67
</PropertyGroup>
78

8-
<ItemGroup>
9-
<ApplicationDefinition Include="App.xaml" />
10-
<Page Include="MainWindow.xaml" />
11-
</ItemGroup>
12-
13-
<ItemGroup>
14-
<FrameworkReference Include="Microsoft.DesktopUI"/>
15-
</ItemGroup>
16-
179
</Project>

‎DotNetCore.WinForms/DotNetCore.WinForms.csproj

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>WinExe</OutputType>
5+
<TargetFramework>netcoreapp3.0</TargetFramework>
6+
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<FrameworkReference Include="Microsoft.DesktopUI"/>
10+
</ItemGroup>
11+
12+
</Project>

‎DotNetCore.WinForms/Form1.Designer.cs

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

‎DotNetCore.WinForms/Form1.cs

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.ComponentModel;
4+
using System.Data;
5+
using System.Drawing;
6+
using System.Linq;
7+
using System.Text;
8+
using System.Threading.Tasks;
9+
using System.Windows.Forms;
10+
11+
namespace DotNetCore.WinForms
12+
{
13+
public partial class Form1 : Form
14+
{
15+
public Form1()
16+
{
17+
InitializeComponent();
18+
}
19+
20+
private void buttonExit_Click(object sender, EventArgs e)
21+
{
22+
Application.Exit();
23+
}
24+
}
25+
}

‎DotNetCore.WinForms/Form1.resx

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
</root>

‎DotNetCore.WinForms/Program.cs

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Threading.Tasks;
5+
using System.Windows.Forms;
6+
7+
namespace DotNetCore.WinForms
8+
{
9+
static class Program
10+
{
11+
/// <summary>
12+
/// The main entry point for the application.
13+
/// </summary>
14+
[STAThread]
15+
static void Main()
16+
{
17+
Application.EnableVisualStyles();
18+
Application.SetCompatibleTextRenderingDefault(false);
19+
Application.Run(new Form1());
20+
}
21+
}
22+
}

‎DotNetCore.WinForms/Properties/launchSettings.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"profiles": {
3+
"DotNetCore.WinForms": {
4+
"commandName": "Project"
5+
}
6+
}
7+
}

‎WebView.WPF/MainWindow.xaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@
1111
<Grid.ColumnDefinitions>
1212
<ColumnDefinition/>
1313
<ColumnDefinition/>
14+
<ColumnDefinition/>
1415
</Grid.ColumnDefinitions>
1516

1617
<controls:WebViewCompatible Source="http://html5test.com"/>
17-
<WebBrowser Grid.Column="1" Source="http://html5test.com"/>
18+
<controls:WebView Grid.Column="1" Source="http://html5test.com"/>
19+
<WebBrowser Grid.Column="2" Source="http://html5test.com"/>
1820

1921
</Grid>
2022
</Window>

0 commit comments

Comments
 (0)