Added the NewControl as a content replacement for the MainWindow.
This commit is contained in:
1 parent
8c7e1b917f
commit
0e5be04b02
31 files changed
+261
-152
No files matched your search
+128
-19
@@ -1,26 +1,135 @@
|
||||
using System;
|
||||
using ReactiveUI;
|
||||
|
||||
namespace PcgsInvUi.Models;
|
||||
|
||||
public class Coin
|
||||
public class Coin : ReactiveObject
|
||||
{
|
||||
public int PcgsNumber { get; set; }
|
||||
public string Name { get; set; }
|
||||
public int Year { get; set; }
|
||||
public string Denomination { get; set; }
|
||||
public string MintMark { get; set; }
|
||||
public string Grade { get; set; }
|
||||
public double PriceGuideValue { get; set; }
|
||||
public string CoinFactsLink { get; set; }
|
||||
public string MajorVariety { get; set; }
|
||||
public string MinorVariety { get; set; }
|
||||
public string DieVariety { get; set; }
|
||||
public string Series { get; set; }
|
||||
public string Category { get; set; }
|
||||
public string Designation { get; set; }
|
||||
public int CertificateNumber { get; set; }
|
||||
public int Quantity { get; set; }
|
||||
public int PcgsNumber
|
||||
{
|
||||
get => _pcgsNumber;
|
||||
set => this.RaiseAndSetIfChanged(ref _pcgsNumber, value);
|
||||
}
|
||||
private int _pcgsNumber;
|
||||
|
||||
public string Name
|
||||
{
|
||||
get => _name;
|
||||
set => this.RaiseAndSetIfChanged(ref _name, value);
|
||||
}
|
||||
private string _name;
|
||||
|
||||
public int Year
|
||||
{
|
||||
get => _year;
|
||||
set => this.RaiseAndSetIfChanged(ref _year, value);
|
||||
}
|
||||
private int _year;
|
||||
|
||||
public string Denomination
|
||||
{
|
||||
get => _denomination;
|
||||
set => this.RaiseAndSetIfChanged(ref _denomination, value);
|
||||
}
|
||||
private string _denomination;
|
||||
|
||||
public string MintMark
|
||||
{
|
||||
get => _mintMark;
|
||||
set => this.RaiseAndSetIfChanged(ref _mintMark, value);
|
||||
}
|
||||
private string _mintMark;
|
||||
|
||||
public string Grade
|
||||
{
|
||||
get => _grade;
|
||||
set => this.RaiseAndSetIfChanged(ref _grade, value);
|
||||
}
|
||||
private string _grade;
|
||||
|
||||
public double PriceGuideValue
|
||||
{
|
||||
get => _priceGuideValue;
|
||||
set => this.RaiseAndSetIfChanged(ref _priceGuideValue, value);
|
||||
}
|
||||
private double _priceGuideValue;
|
||||
|
||||
public string CoinFactsLink
|
||||
{
|
||||
get => _coinFactsLink;
|
||||
set => this.RaiseAndSetIfChanged(ref _coinFactsLink, value);
|
||||
}
|
||||
private string _coinFactsLink;
|
||||
|
||||
public string MajorVariety
|
||||
{
|
||||
get => _majorVariety;
|
||||
set => this.RaiseAndSetIfChanged(ref _majorVariety, value);
|
||||
}
|
||||
private string _majorVariety;
|
||||
|
||||
public string MinorVariety
|
||||
{
|
||||
get => _minorVariety;
|
||||
set => this.RaiseAndSetIfChanged(ref _minorVariety, value);
|
||||
}
|
||||
private string _minorVariety;
|
||||
|
||||
public string DieVariety
|
||||
{
|
||||
get => _dieVariety;
|
||||
set => this.RaiseAndSetIfChanged(ref _dieVariety, value);
|
||||
}
|
||||
private string _dieVariety;
|
||||
|
||||
public string Series
|
||||
{
|
||||
get => _series;
|
||||
set => this.RaiseAndSetIfChanged(ref _series, value);
|
||||
}
|
||||
private string _series;
|
||||
|
||||
public string Category
|
||||
{
|
||||
get => _category;
|
||||
set => this.RaiseAndSetIfChanged(ref _category, value);
|
||||
}
|
||||
private string _category;
|
||||
|
||||
public string Designation
|
||||
{
|
||||
get => _designation;
|
||||
set => this.RaiseAndSetIfChanged(ref _designation, value);
|
||||
}
|
||||
private string _designation;
|
||||
|
||||
public int CertificateNumber
|
||||
{
|
||||
get => _certificateNumber;
|
||||
set => this.RaiseAndSetIfChanged(ref _certificateNumber, value);
|
||||
}
|
||||
private int _certificateNumber;
|
||||
|
||||
public int Quantity
|
||||
{
|
||||
get => _quantity;
|
||||
set => this.RaiseAndSetIfChanged(ref _quantity, value);
|
||||
}
|
||||
private int _quantity;
|
||||
|
||||
public double TotalPrice => Quantity * PriceGuideValue;
|
||||
public double PaidFor { get; set; }
|
||||
public String Notes { get; set; }
|
||||
|
||||
public double PaidFor
|
||||
{
|
||||
get => _paidFor;
|
||||
set => this.RaiseAndSetIfChanged(ref _paidFor, value);
|
||||
}
|
||||
private double _paidFor;
|
||||
|
||||
public String Notes
|
||||
{
|
||||
get => _notes;
|
||||
set => this.RaiseAndSetIfChanged(ref _notes, value);
|
||||
}
|
||||
private string _notes;
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
using System;
|
||||
using System.Reactive;
|
||||
using PcgsInvUi.Models;
|
||||
using ReactiveUI;
|
||||
|
||||
namespace PcgsInvUi.ViewModels;
|
||||
|
||||
public class EditViewModel : ViewModelBase
|
||||
{
|
||||
public Coin CurrentCoin { get; set; }
|
||||
|
||||
public ReactiveCommand<Unit, Unit> OkCommand { get; }
|
||||
|
||||
public EditViewModel(Coin coin)
|
||||
{
|
||||
CurrentCoin = coin;
|
||||
|
||||
var okEnabled = this.WhenAnyValue(
|
||||
x => x.CurrentCoin.PcgsNumber,
|
||||
x => x.CurrentCoin.Grade,
|
||||
x => x.CurrentCoin.Quantity,
|
||||
(id, grade, quantity) => (id != 0) &&
|
||||
!string.IsNullOrWhiteSpace(grade) &&
|
||||
(quantity != 0)
|
||||
);
|
||||
|
||||
// Setup OkCommand - all Coin-related properties must be non-whitespace.
|
||||
OkCommand = ReactiveCommand.Create(() => { });
|
||||
}
|
||||
}
|
||||
@@ -9,23 +9,29 @@ namespace PcgsInvUi.ViewModels;
|
||||
public class MainWindowViewModel : ViewModelBase
|
||||
{
|
||||
public CoinListViewModel List { get; }
|
||||
private ViewModelBase _content;
|
||||
private ViewModelBase _mainContent;
|
||||
private ViewModelBase _sideContent;
|
||||
|
||||
public MainWindowViewModel(CoinCollection coins)
|
||||
{
|
||||
List = new CoinListViewModel(coins.GetItems());
|
||||
Content = List;
|
||||
MainContent = List;
|
||||
}
|
||||
|
||||
public ViewModelBase Content
|
||||
public ViewModelBase MainContent
|
||||
{
|
||||
get => _content;
|
||||
private set => this.RaiseAndSetIfChanged(ref _content, value);
|
||||
get => _mainContent;
|
||||
private set => this.RaiseAndSetIfChanged(ref _mainContent, value);
|
||||
}
|
||||
|
||||
public ViewModelBase SidebarContent
|
||||
{
|
||||
get => _sideContent;
|
||||
private set => this.RaiseAndSetIfChanged(ref _sideContent, value);
|
||||
}
|
||||
|
||||
public void AddItem()
|
||||
{
|
||||
Console.WriteLine("You hit the button!");
|
||||
var newViewModel = new NewViewModel();
|
||||
|
||||
Observable.Merge(
|
||||
@@ -37,9 +43,24 @@ public class MainWindowViewModel : ViewModelBase
|
||||
if (model != null)
|
||||
List.CoinCollection.Add(model);
|
||||
|
||||
Content = List;
|
||||
MainContent = List;
|
||||
});
|
||||
|
||||
Content = newViewModel;
|
||||
MainContent = newViewModel;
|
||||
}
|
||||
|
||||
public void EditItem()
|
||||
{
|
||||
var editViewModel = new EditViewModel(List.SelectedCoin);
|
||||
}
|
||||
|
||||
public void DeleteItem()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public void FindItem()
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
using System;
|
||||
using System.Reactive;
|
||||
using System.Collections.Generic;
|
||||
using PcgsInvUi.Models;
|
||||
using ReactiveUI;
|
||||
|
||||
@@ -26,17 +27,62 @@ public class NewViewModel : ViewModelBase
|
||||
get => _quantity;
|
||||
set => this.RaiseAndSetIfChanged(ref _quantity, value);
|
||||
}
|
||||
public List<string> GradesList { get; }
|
||||
|
||||
public NewViewModel()
|
||||
{
|
||||
var okEnabled = this.WhenAnyValue(
|
||||
x => x.PcgsNumber,
|
||||
x => !string.IsNullOrWhiteSpace(x));
|
||||
x => x.Grade,
|
||||
x => x.Quantity,
|
||||
(id, grade, quantity) => !string.IsNullOrWhiteSpace(id) &&
|
||||
!string.IsNullOrWhiteSpace(grade) &&
|
||||
!string.IsNullOrWhiteSpace(quantity));
|
||||
|
||||
// This will eventually send our request to the public API, then construct our coin.
|
||||
OkCommand = ReactiveCommand.Create(
|
||||
() => new Coin { PcgsNumber = Int32.Parse(PcgsNumber) },
|
||||
() => new Coin { PcgsNumber = Int32.Parse(PcgsNumber),
|
||||
Grade = Grade,
|
||||
Quantity = Int32.Parse(Quantity) },
|
||||
okEnabled);
|
||||
|
||||
CancelCommand = ReactiveCommand.Create(() => { });
|
||||
|
||||
// Initialize grade values for use in the view.
|
||||
// This must be typed out manually, as there is no way to get a list of grades from the API.
|
||||
GradesList = new List<string>()
|
||||
{
|
||||
"P-01",
|
||||
"FR-02",
|
||||
"AG-03",
|
||||
"G-04",
|
||||
"G-06",
|
||||
"VG-08",
|
||||
"VG-10",
|
||||
"F-12",
|
||||
"F-15",
|
||||
"VF-20",
|
||||
"VF-25",
|
||||
"VF-30",
|
||||
"VF-35",
|
||||
"EF-40",
|
||||
"EF-45",
|
||||
"AU-50",
|
||||
"AU-53",
|
||||
"AU-55",
|
||||
"AU-58",
|
||||
"MS-60",
|
||||
"MS-61",
|
||||
"MS-62",
|
||||
"MS-63",
|
||||
"MS-64",
|
||||
"MS-65",
|
||||
"MS-66",
|
||||
"MS-67",
|
||||
"MS-68",
|
||||
"MS-69",
|
||||
"MS-70"
|
||||
};
|
||||
}
|
||||
|
||||
public ReactiveCommand<Unit, Coin> OkCommand { get; }
|
||||
|
||||
@@ -55,11 +55,14 @@
|
||||
</DockPanel>
|
||||
<DockPanel DockPanel.Dock="Bottom">
|
||||
<Grid HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="5" ColumnDefinitions="Auto, Auto, Auto, Auto" DockPanel.Dock="Left">
|
||||
<Button Grid.Column="0" Margin="5" Width="100" HorizontalContentAlignment="Center" Content="New..." />
|
||||
<Button Grid.Column="1" Margin="5" Width="100" HorizontalContentAlignment="Center" Content="Edit..." />
|
||||
<Button Grid.Column="2" Margin="5" Width="100" HorizontalContentAlignment="Center" Content="Delete" />
|
||||
<Button Grid.Column="3" Margin="5" Width="100" HorizontalContentAlignment="Center" Content="Find..."
|
||||
<Button Grid.Column="0" Margin="5" Width="100" HorizontalContentAlignment="Center" Content="New..."
|
||||
Command="{Binding $parent[Window].((viewModels:MainWindowViewModel)DataContext).AddItem}"/>
|
||||
<Button Grid.Column="1" Margin="5" Width="100" HorizontalContentAlignment="Center" Content="Edit..."
|
||||
Command="{Binding $parent[Window].((viewModels:MainWindowViewModel)DataContext).EditItem}"/>
|
||||
<Button Grid.Column="2" Margin="5" Width="100" HorizontalContentAlignment="Center" Content="Delete"
|
||||
Command="{Binding $parent[Window].((viewModels:MainWindowViewModel)DataContext).DeleteItem}"/>
|
||||
<Button Grid.Column="3" Margin="5" Width="100" HorizontalContentAlignment="Center" Content="Find..."
|
||||
Command="{Binding $parent[Window].((viewModels:MainWindowViewModel)DataContext).FindItem}"/>
|
||||
</Grid>
|
||||
<Grid HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="5" ColumnDefinitions="Auto, Auto" DockPanel.Dock="Right">
|
||||
<Label Grid.Column="0" Margin="5" VerticalAlignment="Center" Content="{Binding TotalValue, StringFormat='Total Value: ${0:0.00}'}" />
|
||||
|
||||
@@ -5,5 +5,11 @@
|
||||
xmlns:viewModels="clr-namespace:PcgsInvUi.ViewModels"
|
||||
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
|
||||
x:Class="PcgsInvUi.Views.MainWindow" x:DataType="viewModels:MainWindowViewModel"
|
||||
Title="MainWindow"
|
||||
Content="{Binding Content}" />
|
||||
Title="MainWindow">
|
||||
<SplitView Name="Sidebar">
|
||||
<SplitView.Pane>
|
||||
<UserControl Content="{Binding SidebarContent}"/>
|
||||
</SplitView.Pane>
|
||||
<UserControl Content="{Binding MainContent}"/>
|
||||
</SplitView>
|
||||
</Window>
|
||||
@@ -1,24 +0,0 @@
|
||||
<UserControl xmlns="https://github.com/avaloniaui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:viewmodels="clr-namespace:PcgsInvUi.ViewModels"
|
||||
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
|
||||
x:Class="PcgsInvUi.Views.NewControl" x:DataType="viewmodels:NewViewModel">
|
||||
<DockPanel>
|
||||
<Grid DockPanel.Dock="Top" ColumnDefinitions="Auto, *" RowDefinitions="*, *, *">
|
||||
<Label Grid.Column="0" Grid.Row="0" Margin="5, 5, 20, 5" VerticalAlignment="Center" Content="PCGS #:"/>
|
||||
<TextBox Grid.Column="1" Grid.Row="0" Margin="5, 5, 10, 5" />
|
||||
<Label Grid.Column="0" Grid.Row="1" Margin="5, 5, 20, 5" VerticalAlignment="Center" Content="Grade:"/>
|
||||
<ComboBox Name="GradeChoices" Grid.Column="1" Grid.Row="1" SelectedIndex="0" Margin="5, 5, 10, 5" />
|
||||
<Label Grid.Column="0" Grid.Row="2" Margin="5, 5, 20, 5" VerticalAlignment="Center" Content="Quantity:"/>
|
||||
<TextBox Grid.Column="1" Grid.Row="2" Margin="5, 5, 10, 5" />
|
||||
</Grid>
|
||||
<Grid DockPanel.Dock="Bottom" ColumnDefinitions="*, *">
|
||||
<Button Grid.Column="0" Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center"
|
||||
Width="90" HorizontalContentAlignment="Center" Content="OK" Command="{Binding OkCommand}" />
|
||||
<Button Grid.Column="1" Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center"
|
||||
Width="90" HorizontalContentAlignment="Center" Content="Cancel" Command="{Binding CancelCommand}"/>
|
||||
</Grid>
|
||||
</DockPanel>
|
||||
</UserControl>
|
||||
@@ -1,64 +0,0 @@
|
||||
using System.Collections.ObjectModel;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Interactivity;
|
||||
namespace PcgsInvUi.Views;
|
||||
|
||||
public partial class NewControl : UserControl
|
||||
{
|
||||
public string SelectedGrade { get; set; } = "";
|
||||
|
||||
public void AcceptClick(object source, RoutedEventArgs args)
|
||||
{
|
||||
// TODO Send a message to the MainWindow to add a new coin and close the NewControl.
|
||||
}
|
||||
|
||||
public void CancelClick(object source, RoutedEventArgs args)
|
||||
{
|
||||
// TODO Send a message to the MainWindow to close the NewControl.
|
||||
}
|
||||
|
||||
public NewControl()
|
||||
{
|
||||
InitializeComponent();
|
||||
GradeChoices.SelectedItem = SelectedGrade;
|
||||
// Had to type this out - there's no pattern to follow.
|
||||
GradeChoices.ItemsSource = new ObservableCollection<string>()
|
||||
{
|
||||
"PO01",
|
||||
"FR02",
|
||||
"AG03",
|
||||
"G04",
|
||||
"G06",
|
||||
"VG08",
|
||||
"VG10",
|
||||
"F12",
|
||||
"F15",
|
||||
"VF20",
|
||||
"VF25",
|
||||
"VF30",
|
||||
"VF35",
|
||||
"EF40",
|
||||
"EF45",
|
||||
"AU50",
|
||||
"AU53",
|
||||
"AU55",
|
||||
"AU58",
|
||||
"MS60",
|
||||
"MS61",
|
||||
"MS62",
|
||||
"MS63",
|
||||
"MS64",
|
||||
"MS65",
|
||||
"MS66",
|
||||
"MS67",
|
||||
"MS68",
|
||||
"MS69",
|
||||
"MS70"
|
||||
};
|
||||
}
|
||||
|
||||
public NewControl(object? context = null) : this()
|
||||
{
|
||||
DataContext = context;
|
||||
}
|
||||
}
|
||||
@@ -11,7 +11,7 @@
|
||||
<TextBox Grid.Column="1" Grid.Row="0" Margin="5, 5, 10, 5" Text="{Binding PcgsNumber}"/>
|
||||
<Label Grid.Column="0" Grid.Row="1" Margin="5, 5, 20, 5" VerticalAlignment="Center" Content="Grade:"/>
|
||||
<ComboBox Name="GradeChoices" Grid.Column="1" Grid.Row="1" SelectedIndex="0" Margin="5, 5, 10, 5"
|
||||
SelectedItem="{Binding Grade}"/>
|
||||
ItemsSource="{Binding GradesList}" SelectedItem="{Binding Grade}"/>
|
||||
<Label Grid.Column="0" Grid.Row="2" Margin="5, 5, 20, 5" VerticalAlignment="Center" Content="Quantity:"/>
|
||||
<TextBox Grid.Column="1" Grid.Row="2" Margin="5, 5, 10, 5" Text="{Binding Quantity}"/>
|
||||
</Grid>
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -1 +1 @@
|
||||
c73a14dff2cea9f43e364040c2f040352fb7b7c3
|
||||
625b57bc7d5cf3c88a8ee4293d70f9aaa4250748
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,7 +1,6 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Runtime Version:4.0.30319.42000
|
||||
//
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
|
||||
@@ -27,8 +27,5 @@ build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml
|
||||
[C:/Users/lvas4/RiderProjects/pcgs-inv/PcgsInvUi/Views/MainWindow.axaml]
|
||||
build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml
|
||||
|
||||
[C:/Users/lvas4/RiderProjects/pcgs-inv/PcgsInvUi/Views/NewControl.axaml]
|
||||
build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml
|
||||
|
||||
[C:/Users/lvas4/RiderProjects/pcgs-inv/PcgsInvUi/Views/NewView.axaml]
|
||||
build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml
|
||||
Binary file not shown.
@@ -1 +1 @@
|
||||
7c2a4be69f90a813e2e9b052c9b4c3d947f0d23e
|
||||
28c2b560d2a2c916bc43cb346851b890b0568f29
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -13,19 +13,13 @@
|
||||
"packagesPath": "C:\\Users\\lvas4\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\lvas4\\RiderProjects\\pcgs-inv\\PcgsInvUi\\obj\\",
|
||||
"projectStyle": "PackageReference",
|
||||
"fallbackFolders": [
|
||||
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
|
||||
],
|
||||
"configFilePaths": [
|
||||
"C:\\Users\\lvas4\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
|
||||
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
|
||||
"C:\\Users\\lvas4\\AppData\\Roaming\\NuGet\\NuGet.Config"
|
||||
],
|
||||
"originalTargetFrameworks": [
|
||||
"net6.0"
|
||||
],
|
||||
"sources": {
|
||||
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
|
||||
"https://api.nuget.org/v3/index.json": {}
|
||||
},
|
||||
"frameworks": {
|
||||
|
||||
@@ -5,13 +5,12 @@
|
||||
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
|
||||
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
|
||||
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
|
||||
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\lvas4\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
|
||||
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\lvas4\.nuget\packages\</NuGetPackageFolders>
|
||||
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
|
||||
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.6.0</NuGetToolVersion>
|
||||
</PropertyGroup>
|
||||
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
|
||||
<SourceRoot Include="C:\Users\lvas4\.nuget\packages\" />
|
||||
<SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
|
||||
</ItemGroup>
|
||||
<ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
|
||||
<Import Project="$(NuGetPackageRoot)skiasharp.nativeassets.webassembly\2.88.3\buildTransitive\netstandard1.0\SkiaSharp.NativeAssets.WebAssembly.props" Condition="Exists('$(NuGetPackageRoot)skiasharp.nativeassets.webassembly\2.88.3\buildTransitive\netstandard1.0\SkiaSharp.NativeAssets.WebAssembly.props')" />
|
||||
|
||||
@@ -4737,8 +4737,7 @@
|
||||
]
|
||||
},
|
||||
"packageFolders": {
|
||||
"C:\\Users\\lvas4\\.nuget\\packages\\": {},
|
||||
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}
|
||||
"C:\\Users\\lvas4\\.nuget\\packages\\": {}
|
||||
},
|
||||
"project": {
|
||||
"version": "1.0.0",
|
||||
@@ -4749,19 +4748,13 @@
|
||||
"packagesPath": "C:\\Users\\lvas4\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\lvas4\\RiderProjects\\pcgs-inv\\PcgsInvUi\\obj\\",
|
||||
"projectStyle": "PackageReference",
|
||||
"fallbackFolders": [
|
||||
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
|
||||
],
|
||||
"configFilePaths": [
|
||||
"C:\\Users\\lvas4\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
|
||||
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
|
||||
"C:\\Users\\lvas4\\AppData\\Roaming\\NuGet\\NuGet.Config"
|
||||
],
|
||||
"originalTargetFrameworks": [
|
||||
"net6.0"
|
||||
],
|
||||
"sources": {
|
||||
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
|
||||
"https://api.nuget.org/v3/index.json": {}
|
||||
},
|
||||
"frameworks": {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"version": 2,
|
||||
"dgSpecHash": "DBSL9U0e5FsTRge5IVI9HMsjKd6o1eKyO9DO/ZfBtMatRcSkLCEL5LDn5+BmI1bqCWkB1nwjCLOfNaIsPaEIKQ==",
|
||||
"dgSpecHash": "ywaKGQW1oGeHm9Vidw0OVKLk61kE3/R1CgyEsud2n4N6Ev3x6mpO6UK0rqg++7SFX+l5vRmV8R4Xzn4B4F8Vvg==",
|
||||
"success": true,
|
||||
"projectFilePath": "C:\\Users\\lvas4\\RiderProjects\\pcgs-inv\\PcgsInvUi\\PcgsInvUi.csproj",
|
||||
"expectedPackageFiles": [
|
||||
|
||||
@@ -1 +1 @@
|
||||
"restore":{"projectUniqueName":"C:\\Users\\lvas4\\RiderProjects\\pcgs-inv\\PcgsInvUi\\PcgsInvUi.csproj","projectName":"PcgsInvUi","projectPath":"C:\\Users\\lvas4\\RiderProjects\\pcgs-inv\\PcgsInvUi\\PcgsInvUi.csproj","outputPath":"C:\\Users\\lvas4\\RiderProjects\\pcgs-inv\\PcgsInvUi\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net6.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net6.0":{"targetAlias":"net6.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net6.0":{"targetAlias":"net6.0","dependencies":{"Avalonia":{"target":"Package","version":"[11.0.2, )"},"Avalonia.Desktop":{"target":"Package","version":"[11.0.2, )"},"Avalonia.Diagnostics":{"target":"Package","version":"[11.0.2, )"},"Avalonia.Fonts.Inter":{"target":"Package","version":"[11.0.2, )"},"Avalonia.ReactiveUI":{"target":"Package","version":"[11.0.2, )"},"Avalonia.Themes.Fluent":{"target":"Package","version":"[11.0.2, )"},"Newtonsoft.Json":{"target":"Package","version":"[13.0.3, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"downloadDependencies":[{"name":"Microsoft.AspNetCore.App.Ref","version":"[6.0.22, 6.0.22]"},{"name":"Microsoft.NETCore.App.Host.win-x64","version":"[6.0.22, 6.0.22]"},{"name":"Microsoft.NETCore.App.Ref","version":"[6.0.22, 6.0.22]"},{"name":"Microsoft.WindowsDesktop.App.Ref","version":"[6.0.22, 6.0.22]"}],"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\7.0.401\\RuntimeIdentifierGraph.json"}}
|
||||
"restore":{"projectUniqueName":"C:\\Users\\lvas4\\RiderProjects\\pcgs-inv\\PcgsInvUi\\PcgsInvUi.csproj","projectName":"PcgsInvUi","projectPath":"C:\\Users\\lvas4\\RiderProjects\\pcgs-inv\\PcgsInvUi\\PcgsInvUi.csproj","outputPath":"C:\\Users\\lvas4\\RiderProjects\\pcgs-inv\\PcgsInvUi\\obj\\","projectStyle":"PackageReference","originalTargetFrameworks":["net6.0"],"sources":{"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net6.0":{"targetAlias":"net6.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net6.0":{"targetAlias":"net6.0","dependencies":{"Avalonia":{"target":"Package","version":"[11.0.2, )"},"Avalonia.Desktop":{"target":"Package","version":"[11.0.2, )"},"Avalonia.Diagnostics":{"target":"Package","version":"[11.0.2, )"},"Avalonia.Fonts.Inter":{"target":"Package","version":"[11.0.2, )"},"Avalonia.ReactiveUI":{"target":"Package","version":"[11.0.2, )"},"Avalonia.Themes.Fluent":{"target":"Package","version":"[11.0.2, )"},"Newtonsoft.Json":{"target":"Package","version":"[13.0.3, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"downloadDependencies":[{"name":"Microsoft.AspNetCore.App.Ref","version":"[6.0.22, 6.0.22]"},{"name":"Microsoft.NETCore.App.Host.win-x64","version":"[6.0.22, 6.0.22]"},{"name":"Microsoft.NETCore.App.Ref","version":"[6.0.22, 6.0.22]"},{"name":"Microsoft.WindowsDesktop.App.Ref","version":"[6.0.22, 6.0.22]"}],"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\7.0.401\\RuntimeIdentifierGraph.json"}}
|
||||
@@ -1 +1 @@
|
||||
16968216666109401
|
||||
16968645301156240
|
||||
@@ -1 +1 @@
|
||||
16968216666109401
|
||||
16968645301156240
|
||||
Reference in new issue
Block a user