Skip to content

Commit

Permalink
[BREAKING] Rename Namespace, remove capitals and separate
Browse files Browse the repository at this point in the history
  • Loading branch information
pomianowski committed Jun 11, 2022
1 parent 9c59d7c commit 2a783e4
Show file tree
Hide file tree
Showing 414 changed files with 1,400 additions and 1,402 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Publish
uses: alirezanet/[email protected]
with:
PROJECT_FILE_PATH: src/WPFUI/WPFUI.csproj
PROJECT_FILE_PATH: src/Wpf.Ui/Wpf.Ui.csproj
VERSION_FILE_PATH: src/Directory.Build.props
NUGET_KEY: ${{secrets.NUGET_API_KEY}}
TAG_COMMIT: false
6 changes: 3 additions & 3 deletions .github/workflows/DV.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ jobs:
nuget-version: 'latest'

- name: NuGet restore
run: nuget restore src/WPFUI.sln
run: nuget restore src/Wpf.Ui.sln

- name: Build
run: msbuild src/WPFUI.sln -p:Configuration=Release -m
run: msbuild src/Wpf.Ui.sln -p:Configuration=Release -m

- name: Publish net60
uses: actions/upload-artifact@v3
id: publish_net6
with:
name: WPFUI_DEMO-NET6
path: |
src/WPFUI.Demo/bin/Release/net6.0-windows10.0.22000.0
src/Wpf.Ui.Demo/bin/Release/net6.0-windows10.0.22000.0
87 changes: 0 additions & 87 deletions src/WPFUI.Demo/WPFUI.Demo.csproj

This file was deleted.

103 changes: 0 additions & 103 deletions src/WPFUI/Styles/WPFUI.xaml

This file was deleted.

8 changes: 4 additions & 4 deletions src/WPFUI.Demo/App.xaml → src/Wpf.Ui.Demo/App.xaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Application
x:Class="WPFUI.Demo.App"
x:Class="Wpf.Ui.Demo.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:wpfui="http://schemas.lepo.co/wpfui/2022/xaml"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
DispatcherUnhandledException="OnDispatcherUnhandledException"
Exit="OnExit"
Startup="OnStartup">
<Application.Resources>
<wpfui:Resources Theme="Dark" />
<ui:Resources Theme="Dark" />
</Application.Resources>
</Application>

Expand All @@ -17,7 +17,7 @@
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<wpfui:Resources Theme="Dark" />
<ui:Resources Theme="Dark" />
<ResourceDictionary Source="pack://application:,,,/WPFUI;component/Styles/Theme/Dark.xaml" />
<ResourceDictionary Source="pack://application:,,,/WPFUI;component/Styles/WPFUI.xaml" />
</ResourceDictionary.MergedDictionaries>
Expand Down
16 changes: 8 additions & 8 deletions src/WPFUI.Demo/App.xaml.cs → src/Wpf.Ui.Demo/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using WPFUI.Demo.Models;
using WPFUI.Demo.Services;
using WPFUI.Demo.Services.Contracts;
using WPFUI.Demo.ViewModels;
using WPFUI.Mvvm.Contracts;
using WPFUI.Mvvm.Services;

namespace WPFUI.Demo;
using Wpf.Ui.Demo.Models;
using Wpf.Ui.Demo.Services;
using Wpf.Ui.Demo.Services.Contracts;
using Wpf.Ui.Demo.ViewModels;
using Wpf.Ui.Mvvm.Contracts;
using Wpf.Ui.Mvvm.Services;

namespace Wpf.Ui.Demo;

/// <summary>
/// Interaction logic for App.xaml
Expand Down
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace WPFUI.Demo.Models;
namespace Wpf.Ui.Demo.Models;

public class AppConfig
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

using System.Windows.Media;

namespace WPFUI.Demo.Models.Colors;
namespace Wpf.Ui.Demo.Models.Colors;

public struct Pa__one
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
// All Rights Reserved.

namespace WPFUI.Demo.Models.Data;
namespace Wpf.Ui.Demo.Models.Data;

public class Customer
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
// All Rights Reserved.

namespace WPFUI.Demo.Models.Data;
namespace Wpf.Ui.Demo.Models.Data;
public enum OrderStatus
{
None,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using System;
using System.Collections.Generic;

namespace WPFUI.Demo.Models;
namespace Wpf.Ui.Demo.Models;

public class Hardware
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
// All Rights Reserved.

namespace WPFUI.Demo.Models.Icons;
namespace Wpf.Ui.Demo.Models.Icons;

public struct DisplayableIcon
{
Expand All @@ -15,5 +15,5 @@ public struct DisplayableIcon

public string Symbol { get; set; }

public WPFUI.Common.SymbolRegular Icon { get; set; }
public Wpf.Ui.Common.SymbolRegular Icon { get; set; }
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Wpf.Ui.Demo/Resources/geo_icons.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Wpf.Ui.Demo/Resources/halo_infinite.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Wpf.Ui.Demo/Resources/master_chief.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
Binary file added src/Wpf.Ui.Demo/Resources/wpfui_full.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
using System.Threading.Tasks;
using System.Windows;
using Microsoft.Extensions.Hosting;
using WPFUI.Demo.Views;
using WPFUI.Mvvm.Contracts;
using Wpf.Ui.Demo.Views;
using Wpf.Ui.Mvvm.Contracts;

namespace WPFUI.Demo.Services;
namespace Wpf.Ui.Demo.Services;

/// <summary>
/// Managed host of the application.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

using System;

namespace WPFUI.Demo.Services.Contracts;
namespace Wpf.Ui.Demo.Services.Contracts;

public interface ITestWindowService
{
Expand Down
Loading

0 comments on commit 2a783e4

Please sign in to comment.