Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
d9cb6d6
Added nuspec file to publish to nuget
newky2k Jul 18, 2018
ec054f4
Updated to add net core support
Oct 12, 2020
73905ae
Added DevOps build files
Oct 12, 2020
5dd3236
Merge pull request #1 from newky2k/development
newky2k Oct 12, 2020
2a1aa79
Set up CI with Azure Pipelines
newky2k Oct 12, 2020
283438f
Update azure-pipelines-release.yml for Azure Pipelines
newky2k Oct 12, 2020
e56061b
Update azure-pipelines-release.yml for Azure Pipelines
newky2k Oct 12, 2020
b0d52dc
Update azure-pipelines-release.yml for Azure Pipelines
newky2k Oct 12, 2020
bbe96b5
added global.json
Oct 12, 2020
eb2b83b
Update azure-pipelines-release.yml for Azure Pipelines
newky2k Oct 12, 2020
72d69bc
Update azure-pipelines-release.yml for Azure Pipelines
newky2k Oct 12, 2020
87a7598
Update azure-pipelines-mergetest.yml for Azure Pipelines
newky2k Oct 12, 2020
1a4a56d
Update azure-pipelines-mergetest.yml for Azure Pipelines
newky2k Oct 12, 2020
92d6a26
Update azure-pipelines-release.yml for Azure Pipelines
newky2k Oct 12, 2020
527c8d9
Update azure-pipelines-release.yml for Azure Pipelines
newky2k Oct 12, 2020
55f5b83
Removed dependency on compatibility pack
Oct 12, 2020
3ec6568
Merge branch 'master' of https://github.com/newky2k/WPF-Masonry
Oct 12, 2020
621d28a
Added initial UWP mode
Feb 12, 2021
499cddb
Added demo
Feb 12, 2021
18c7d26
Work on UWP tiles
Mar 2, 2021
be254ef
Added xaml masonry project with uwp and winui support
Mar 3, 2021
f1f480e
added masonry control and and generic.xaml
Mar 7, 2021
9d55259
Update to new versions of .net
newky2k May 20, 2024
f0a6b42
Migrated wpf sample to Net 8 and replaced UWP with WinUI support
newky2k Jun 2, 2024
2f536b1
Updated to use readme and pipelines
newky2k Jun 2, 2024
74839c7
Merge pull request #3 from newky2k/development
newky2k Jun 2, 2024
ef0b8f2
Updated build config
newky2k Jun 2, 2024
4a29c3d
Updated to .NET 9.0
newky2k Dec 1, 2024
f2f989c
Merge pull request #4 from newky2k/development
newky2k Dec 1, 2024
a05748b
Updated to WPF Windows 10
newky2k Mar 13, 2025
acc607b
Merge pull request #5 from newky2k/development
newky2k Mar 13, 2025
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
7 changes: 3 additions & 4 deletions Masonry.Example/App.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
</startup>
</configuration>
</configuration>
6 changes: 5 additions & 1 deletion Masonry.Example/App.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
StartupUri="Shell.xaml">
<Application.Resources>

<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Themes/Fluent.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
</Application>
133 changes: 12 additions & 121 deletions Masonry.Example/Masonry.Example.csproj
Original file line number Diff line number Diff line change
@@ -1,128 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.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>{0ACC6BCC-EEC0-4E97-AF52-060FDB7E4DC2}</ProjectGuid>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Masonry.Example</RootNamespace>
<AssemblyName>Masonry.Example</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
<TargetFramework>net9.0-windows</TargetFramework>
<Nullable>disable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<UseWPF>true</UseWPF>
</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>
</PropertyGroup>
<ItemGroup>
<Reference Include="Masonry">
<HintPath>..\Masonry\bin\Debug\Masonry.dll</HintPath>
</Reference>
<Reference Include="Prism, Version=6.1.0.0, Culture=neutral, PublicKeyToken=91a96d2a154366d8, processorArchitecture=MSIL">
<HintPath>..\packages\Prism.Core.6.1.0\lib\net45\Prism.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Prism.Wpf, Version=6.1.0.0, Culture=neutral, PublicKeyToken=91a96d2a154366d8, processorArchitecture=MSIL">
<HintPath>..\packages\Prism.Wpf.6.1.0\lib\net45\Prism.Wpf.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<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="Common\RandomBrush.cs" />
<Compile Include="Common\TextBoxMaskBehavior.cs" />
<Compile Include="GlobalSuppressions.cs" />
<Compile Include="Shell.xaml.cs">
<DependentUpon>Shell.xaml</DependentUpon>
</Compile>
<Compile Include="ViewModels\MainViewModel.cs" />
<Compile Include="Views\MainView.xaml.cs">
<DependentUpon>MainView.xaml</DependentUpon>
</Compile>
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Page Include="Shell.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\MainView.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="..\default.licenseheader">
<Link>default.licenseheader</Link>
</None>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<AppDesigner Include="Properties\" />
<PackageReference Include="DSoft.System.Mvvm" Version="3.3.2405.241" />
</ItemGroup>

<ItemGroup>
<None Include="App.config" />
<ProjectReference Include="..\Masonry\Masonry.csproj" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- 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>

</Project>
23 changes: 0 additions & 23 deletions Masonry.Example/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,6 @@ You should have received a copy of the GNU General Public License
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.

[assembly: AssemblyTitle("Masonry.Example")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Masonry.Example")]
[assembly: AssemblyCopyright("Copyright © 2016 by Nikita Bernthaler")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
Expand All @@ -59,17 +50,3 @@ You should have received a copy of the GNU General Public License
//(used if a resource is not found in the page,
// app, or any theme specific resource dictionaries)
)]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]

[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
63 changes: 0 additions & 63 deletions Masonry.Example/Properties/Resources.Designer.cs

This file was deleted.

117 changes: 0 additions & 117 deletions Masonry.Example/Properties/Resources.resx

This file was deleted.

Loading