Skip to content

Commit b2dfbaf

Browse files
PiedonePiedone
committed
Merge branch 'dev' into issue/OSOE-1109
# Conflicts: # Lombiq.OSOCE.sln
2 parents 42fbd11 + 915b18a commit b2dfbaf

8 files changed

+51
-4
lines changed

‎Lombiq.OSOCE.sln

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lombiq.EInvoiceValidator.Sa
262262
EndProject
263263
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lombiq.EInvoiceValidator.Tests", "src\Libraries\Lombiq.EInvoiceValidator\Lombiq.EInvoiceValidator.Tests\Lombiq.EInvoiceValidator.Tests.csproj", "{BBDBF5A0-51B6-41C5-925F-66FD9CF46E9D}"
264264
EndProject
265+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lombiq.BaseTheme.Core", "src\Themes\Lombiq.BaseTheme\Lombiq.BaseTheme.Core\Lombiq.BaseTheme.Core.csproj", "{B469FA12-4A28-42D9-8671-FBED3C3C98FB}"
266+
EndProject
267+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lombiq.BaseTheme.Native", "src\Themes\Lombiq.BaseTheme\Lombiq.BaseTheme.Native\Lombiq.BaseTheme.Native.csproj", "{5E185E2A-A87C-412B-9F9F-8209C251DBAD}"
268+
EndProject
269+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lombiq.BaseTheme.Native.Samples", "src\Themes\Lombiq.BaseTheme\Lombiq.BaseTheme.Native.Samples\Lombiq.BaseTheme.Native.Samples.csproj", "{C56A4DED-9C33-4543-857C-C351F9AE586E}"
270+
EndProject
265271
Global
266272
GlobalSection(SolutionConfigurationPlatforms) = preSolution
267273
Debug|Any CPU = Debug|Any CPU
@@ -1508,6 +1514,42 @@ Global
15081514
{69FFC308-B446-4E43-B0F3-870AF75190B2}.Release|x64.Build.0 = Release|Any CPU
15091515
{69FFC308-B446-4E43-B0F3-870AF75190B2}.Release|x86.ActiveCfg = Release|Any CPU
15101516
{69FFC308-B446-4E43-B0F3-870AF75190B2}.Release|x86.Build.0 = Release|Any CPU
1517+
{B469FA12-4A28-42D9-8671-FBED3C3C98FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1518+
{B469FA12-4A28-42D9-8671-FBED3C3C98FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
1519+
{B469FA12-4A28-42D9-8671-FBED3C3C98FB}.Debug|x64.ActiveCfg = Debug|Any CPU
1520+
{B469FA12-4A28-42D9-8671-FBED3C3C98FB}.Debug|x64.Build.0 = Debug|Any CPU
1521+
{B469FA12-4A28-42D9-8671-FBED3C3C98FB}.Debug|x86.ActiveCfg = Debug|Any CPU
1522+
{B469FA12-4A28-42D9-8671-FBED3C3C98FB}.Debug|x86.Build.0 = Debug|Any CPU
1523+
{B469FA12-4A28-42D9-8671-FBED3C3C98FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
1524+
{B469FA12-4A28-42D9-8671-FBED3C3C98FB}.Release|Any CPU.Build.0 = Release|Any CPU
1525+
{B469FA12-4A28-42D9-8671-FBED3C3C98FB}.Release|x64.ActiveCfg = Release|Any CPU
1526+
{B469FA12-4A28-42D9-8671-FBED3C3C98FB}.Release|x64.Build.0 = Release|Any CPU
1527+
{B469FA12-4A28-42D9-8671-FBED3C3C98FB}.Release|x86.ActiveCfg = Release|Any CPU
1528+
{B469FA12-4A28-42D9-8671-FBED3C3C98FB}.Release|x86.Build.0 = Release|Any CPU
1529+
{5E185E2A-A87C-412B-9F9F-8209C251DBAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1530+
{5E185E2A-A87C-412B-9F9F-8209C251DBAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
1531+
{5E185E2A-A87C-412B-9F9F-8209C251DBAD}.Debug|x64.ActiveCfg = Debug|Any CPU
1532+
{5E185E2A-A87C-412B-9F9F-8209C251DBAD}.Debug|x64.Build.0 = Debug|Any CPU
1533+
{5E185E2A-A87C-412B-9F9F-8209C251DBAD}.Debug|x86.ActiveCfg = Debug|Any CPU
1534+
{5E185E2A-A87C-412B-9F9F-8209C251DBAD}.Debug|x86.Build.0 = Debug|Any CPU
1535+
{5E185E2A-A87C-412B-9F9F-8209C251DBAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
1536+
{5E185E2A-A87C-412B-9F9F-8209C251DBAD}.Release|Any CPU.Build.0 = Release|Any CPU
1537+
{5E185E2A-A87C-412B-9F9F-8209C251DBAD}.Release|x64.ActiveCfg = Release|Any CPU
1538+
{5E185E2A-A87C-412B-9F9F-8209C251DBAD}.Release|x64.Build.0 = Release|Any CPU
1539+
{5E185E2A-A87C-412B-9F9F-8209C251DBAD}.Release|x86.ActiveCfg = Release|Any CPU
1540+
{5E185E2A-A87C-412B-9F9F-8209C251DBAD}.Release|x86.Build.0 = Release|Any CPU
1541+
{C56A4DED-9C33-4543-857C-C351F9AE586E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1542+
{C56A4DED-9C33-4543-857C-C351F9AE586E}.Debug|Any CPU.Build.0 = Debug|Any CPU
1543+
{C56A4DED-9C33-4543-857C-C351F9AE586E}.Debug|x64.ActiveCfg = Debug|Any CPU
1544+
{C56A4DED-9C33-4543-857C-C351F9AE586E}.Debug|x64.Build.0 = Debug|Any CPU
1545+
{C56A4DED-9C33-4543-857C-C351F9AE586E}.Debug|x86.ActiveCfg = Debug|Any CPU
1546+
{C56A4DED-9C33-4543-857C-C351F9AE586E}.Debug|x86.Build.0 = Debug|Any CPU
1547+
{C56A4DED-9C33-4543-857C-C351F9AE586E}.Release|Any CPU.ActiveCfg = Release|Any CPU
1548+
{C56A4DED-9C33-4543-857C-C351F9AE586E}.Release|Any CPU.Build.0 = Release|Any CPU
1549+
{C56A4DED-9C33-4543-857C-C351F9AE586E}.Release|x64.ActiveCfg = Release|Any CPU
1550+
{C56A4DED-9C33-4543-857C-C351F9AE586E}.Release|x64.Build.0 = Release|Any CPU
1551+
{C56A4DED-9C33-4543-857C-C351F9AE586E}.Release|x86.ActiveCfg = Release|Any CPU
1552+
{C56A4DED-9C33-4543-857C-C351F9AE586E}.Release|x86.Build.0 = Release|Any CPU
15111553
{BBDBF5A0-51B6-41C5-925F-66FD9CF46E9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15121554
{BBDBF5A0-51B6-41C5-925F-66FD9CF46E9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
15131555
{BBDBF5A0-51B6-41C5-925F-66FD9CF46E9D}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1637,6 +1679,9 @@ Global
16371679
{6522D321-509E-4BA6-B649-B3EC19E34205} = {53D45048-C7C6-4D04-A9DA-8B8271510F99}
16381680
{0F08332F-23BC-43CF-B61A-F76468D5DD67} = {53D45048-C7C6-4D04-A9DA-8B8271510F99}
16391681
{69FFC308-B446-4E43-B0F3-870AF75190B2} = {53D45048-C7C6-4D04-A9DA-8B8271510F99}
1682+
{B469FA12-4A28-42D9-8671-FBED3C3C98FB} = {574156BC-2074-47C9-8EA8-70DED6658DD5}
1683+
{5E185E2A-A87C-412B-9F9F-8209C251DBAD} = {574156BC-2074-47C9-8EA8-70DED6658DD5}
1684+
{C56A4DED-9C33-4543-857C-C351F9AE586E} = {574156BC-2074-47C9-8EA8-70DED6658DD5}
16401685
{BBDBF5A0-51B6-41C5-925F-66FD9CF46E9D} = {41CE6E12-92B4-4CF5-9D9C-C214C41CA8FE}
16411686
EndGlobalSection
16421687
GlobalSection(ExtensibilityGlobals) = postSolution

‎src/Libraries/Lombiq.HelpfulLibraries

Submodule Lombiq.HelpfulLibraries updated 11 files

‎src/Lombiq.OSOCE.Web/Lombiq.OSOCE.Web.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@
5454
<ProjectReference Include="..\Modules\Lombiq.UIKit\Lombiq.UIKit.Widgets\Lombiq.UIKit.Widgets.csproj" />
5555
<ProjectReference Include="..\Modules\Lombiq.VueJs\Lombiq.VueJs.Samples\Lombiq.VueJs.Samples.csproj" />
5656
<ProjectReference Include="..\Modules\Lombiq.Walkthroughs\Lombiq.Walkthroughs\Lombiq.Walkthroughs.csproj" />
57+
<ProjectReference Include="..\Themes\Lombiq.BaseTheme\Lombiq.BaseTheme.Native.Samples\Lombiq.BaseTheme.Native.Samples.csproj" />
58+
<ProjectReference Include="..\Themes\Lombiq.BaseTheme\Lombiq.BaseTheme.Native\Lombiq.BaseTheme.Native.csproj" />
5759
<ProjectReference Include="..\Themes\Lombiq.BaseTheme\Lombiq.BaseTheme.Samples\Lombiq.BaseTheme.Samples.csproj" />
5860
<ProjectReference Include="..\Themes\Lombiq.Hosting.MediaTheme\Lombiq.Hosting.MediaTheme.Tests.Theme\Lombiq.Hosting.MediaTheme.Tests.Theme.csproj" />
5961
<ProjectReference Include="..\Themes\Lombiq.Hosting.MediaTheme\Lombiq.Hosting.MediaTheme\Lombiq.Hosting.MediaTheme.csproj" />

‎src/Modules/Lombiq.UIKit

‎src/Themes/Lombiq.BaseTheme

Submodule Lombiq.BaseTheme updated 93 files

‎src/Themes/Lombiq.Hosting.MediaTheme

‎test/Lombiq.OSOCE.Tests.UI/Tests/VisualVerificationTests/VisualVerificationTests_VerifyHomePageAndLayout_By_TagName_-body-1920x1080_Unix.png

-4.16 KB
Loading

‎test/Lombiq.OSOCE.Tests.UI/Tests/VisualVerificationTests/VisualVerificationTests_VerifyHomePageAndLayout_By_TagName_-body-1920x1080_Win32NT.png

3.77 KB
Loading

0 commit comments

Comments
 (0)