Skip to content

Commit 927d5de

Browse files
johelvisguzmanjohelvisguzman
authored
Merge pull request #204 from johelvisguzman/dev
Merge for '2.4.0' 🆙
2 parents 18341c4 + 6fc6b1e commit 927d5de

File tree

164 files changed

+16866
-10576
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+16866
-10576
lines changed

‎DotNetToolkit.Repository.sln‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetToolkit.Repository.En
1515
EndProject
1616
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetToolkit.Repository.Integration.Test", "test\DotNetToolkit.Repository.Integration.Test\DotNetToolkit.Repository.Integration.Test.csproj", "{2F99B66F-A347-4E8D-8ACA-5A34246A1FA6}"
1717
EndProject
18-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetToolkit.Repository.InMemory", "src\DotNetToolkit.Repository.InMemory\DotNetToolkit.Repository.InMemory.csproj", "{715D2F11-3AAF-476E-9A6A-DCA6DEBD377E}"
19-
EndProject
2018
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetToolkit.Repository.EntityFrameworkCore", "src\DotNetToolkit.Repository.EntityFrameworkCore\DotNetToolkit.Repository.EntityFrameworkCore.csproj", "{0A9D9AA4-F01C-470F-AD5B-5A81EA7A398D}"
2119
EndProject
2220
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetToolkit.Repository.Json", "src\DotNetToolkit.Repository.Json\DotNetToolkit.Repository.Json.csproj", "{B71EA207-390A-4AB0-BFC8-44BA124FC35B}"
@@ -53,10 +51,6 @@ Global
5351
{2F99B66F-A347-4E8D-8ACA-5A34246A1FA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
5452
{2F99B66F-A347-4E8D-8ACA-5A34246A1FA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
5553
{2F99B66F-A347-4E8D-8ACA-5A34246A1FA6}.Release|Any CPU.Build.0 = Release|Any CPU
56-
{715D2F11-3AAF-476E-9A6A-DCA6DEBD377E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
57-
{715D2F11-3AAF-476E-9A6A-DCA6DEBD377E}.Debug|Any CPU.Build.0 = Debug|Any CPU
58-
{715D2F11-3AAF-476E-9A6A-DCA6DEBD377E}.Release|Any CPU.ActiveCfg = Release|Any CPU
59-
{715D2F11-3AAF-476E-9A6A-DCA6DEBD377E}.Release|Any CPU.Build.0 = Release|Any CPU
6054
{0A9D9AA4-F01C-470F-AD5B-5A81EA7A398D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6155
{0A9D9AA4-F01C-470F-AD5B-5A81EA7A398D}.Debug|Any CPU.Build.0 = Debug|Any CPU
6256
{0A9D9AA4-F01C-470F-AD5B-5A81EA7A398D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -89,7 +83,6 @@ Global
8983
{EAE7B507-D908-4650-A301-C3341F005A51} = {DAB3DD1E-AD99-46C9-AC42-07E2F03D5A06}
9084
{8DBCF7DE-532D-45DF-A6B8-5D89415C5B77} = {DD273D5E-6D6C-41FA-A0C8-646CC53C4DC3}
9185
{2F99B66F-A347-4E8D-8ACA-5A34246A1FA6} = {DAB3DD1E-AD99-46C9-AC42-07E2F03D5A06}
92-
{715D2F11-3AAF-476E-9A6A-DCA6DEBD377E} = {DD273D5E-6D6C-41FA-A0C8-646CC53C4DC3}
9386
{0A9D9AA4-F01C-470F-AD5B-5A81EA7A398D} = {DD273D5E-6D6C-41FA-A0C8-646CC53C4DC3}
9487
{B71EA207-390A-4AB0-BFC8-44BA124FC35B} = {DD273D5E-6D6C-41FA-A0C8-646CC53C4DC3}
9588
{BB858B77-5CE8-4301-9FB6-343FFF5B7E63} = {DD273D5E-6D6C-41FA-A0C8-646CC53C4DC3}

‎appveyor.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ build:
4545

4646
after_build:
4747
- dotnet pack .\src\DotNetToolkit.Repository\DotNetToolkit.Repository.csproj --configuration Release
48-
- dotnet pack .\src\DotNetToolkit.Repository.InMemory\DotNetToolkit.Repository.InMemory.csproj --configuration Release
4948
- dotnet pack .\src\DotNetToolkit.Repository.EntityFramework\DotNetToolkit.Repository.EntityFramework.csproj --configuration Release
5049
- dotnet pack .\src\DotNetToolkit.Repository.EntityFrameworkCore\DotNetToolkit.Repository.EntityFrameworkCore.csproj --configuration Release
5150
- dotnet pack .\src\DotNetToolkit.Repository.Json\DotNetToolkit.Repository.Json.csproj --configuration Release

‎samples/DotNetToolkit.Repository.Wpf.Demo/DotNetToolkit.Repository.Wpf.Demo.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,6 @@
150150
<None Include="App.config" />
151151
</ItemGroup>
152152
<ItemGroup>
153-
<ProjectReference Include="..\..\src\DotNetToolkit.Repository.InMemory\DotNetToolkit.Repository.InMemory.csproj">
154-
<Project>{715d2f11-3aaf-476e-9a6a-dca6debd377e}</Project>
155-
<Name>DotNetToolkit.Repository.InMemory</Name>
156-
</ProjectReference>
157153
<ProjectReference Include="..\..\src\DotNetToolkit.Repository\DotNetToolkit.Repository.csproj">
158154
<Project>{76bc5ab7-1198-4c99-b2c3-3b734931f8ee}</Project>
159155
<Name>DotNetToolkit.Repository</Name>

‎samples/DotNetToolkit.Repository.Wpf.Demo/Resources/Themes/Generic.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
</Style>
129129

130130
<Style TargetType="DataGridCell" BasedOn="{StaticResource MetroDataGridCell}">
131-
<Setter Property="ToolTip" Value="{Binding RelativeSource={RelativeSource Self},Path=Content.Text}"/>
131+
<Setter Property="ToolTip" Value="{Binding RelativeSource={RelativeSource Self},Path=Content.Text}" />
132132
</Style>
133133

134134
<Style x:Key="NavigateAzureToggleButtonStyle" TargetType="{x:Type ToggleButton}">

‎samples/DotNetToolkit.Repository.Wpf.Demo/ViewModels/CustomerWorkspaceViewModel.cs‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
using DotNetToolkit.Wpf.Commands;
44
using DotNetToolkit.Wpf.Metro.Dialogs;
55
using DotNetToolkit.Wpf.Mvvm;
6+
using Factories;
67
using Infrastructure;
7-
using InMemory;
88
using Models;
99
using System;
1010
using System.Collections.ObjectModel;
@@ -16,6 +16,8 @@ public class CustomerWorkspaceViewModel : ViewModelBase
1616
private ObservableCollection<CustomerFormViewModel> _customers;
1717
private readonly NavigationController _navigator;
1818

19+
private readonly IRepositoryFactory _repositoryFactory;
20+
1921
#endregion
2022

2123
#region Properties
@@ -43,6 +45,8 @@ public CustomerWorkspaceViewModel()
4345
DeleteCommand = new RelayCommand<CustomerFormViewModel>(OnDelete);
4446
DisplayName = "Customers";
4547
_navigator = NavigationController.Instance;
48+
49+
_repositoryFactory = new RepositoryFactory(new InMemoryRepositoryContextFactory());
4650
}
4751

4852
#endregion
@@ -58,7 +62,7 @@ private async void OnAdd()
5862
viewModel.IsDirty = false;
5963
viewModel.Submitted += async (sender, e) =>
6064
{
61-
var repo = new InMemoryRepository<Customer>();
65+
var repo = _repositoryFactory.Create<Customer>();
6266
var model = new Customer();
6367

6468
AutoMapper.Map(viewModel, model);
@@ -91,8 +95,8 @@ private async void OnEdit(CustomerFormViewModel viewModel)
9195
{
9296
AutoMapper.Map(copy, viewModel);
9397

94-
var repo = new InMemoryRepository<Customer>();
95-
var model = repo.Get(viewModel.Id);
98+
var repo = _repositoryFactory.Create<Customer>();
99+
var model = repo.Find(viewModel.Id);
96100

97101
AutoMapper.Map(viewModel, model);
98102

@@ -118,7 +122,7 @@ private async void OnDelete(CustomerFormViewModel viewModel)
118122
if (await DialogController.Instance.ShowWarningMessageAsync(
119123
$"Do you wish to delete item '{viewModel.Id}'?") == MessageDialogResult.Affirmative)
120124
{
121-
var repo = new InMemoryRepository<Customer>();
125+
var repo = _repositoryFactory.Create<Customer>();
122126

123127
repo.Delete(viewModel.Id);
124128

@@ -166,7 +170,7 @@ private void SetNavigationRestriction(CustomerFormViewModel viewModel)
166170

167171
private void Refresh()
168172
{
169-
var repo = new InMemoryRepository<Customer>();
173+
var repo = _repositoryFactory.Create<Customer>();
170174
var data = repo.FindAll<CustomerFormViewModel>(x => AutoMapper.Map<Customer, CustomerFormViewModel>(x));
171175

172176
Customers = new ObservableCollection<CustomerFormViewModel>(data);

‎samples/DotNetToolkit.Repository.Wpf.Demo/Views/MainWindowView.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<ListBox x:Name="ListBox" ItemsSource="{Binding Workspaces}" SelectedItem="{Binding ActiveItem, Mode=OneWay}" Style="{StaticResource NavigateListBoxStyle}">
2424
<i:Interaction.Triggers>
2525
<i:EventTrigger EventName="SelectionChanged">
26-
<i:InvokeCommandAction Command="{Binding Navigator.NavigateToCommand}" CommandParameter="{Binding ElementName=ListBox, Path=SelectedItem}"/>
26+
<i:InvokeCommandAction Command="{Binding Navigator.NavigateToCommand}" CommandParameter="{Binding ElementName=ListBox, Path=SelectedItem}" />
2727
</i:EventTrigger>
2828
</i:Interaction.Triggers>
2929
</ListBox>

‎src/DotNetToolkit.Repository.AdoNet/AdoNetRepository.cs‎

Lines changed: 0 additions & 81 deletions
This file was deleted.

0 commit comments

Comments
 (0)