2
0
Krzysztof Krysiński 2 долоо хоног өмнө
parent
commit
45fe77410a

+ 1 - 1
src/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
         <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)Custom.ruleset</CodeAnalysisRuleSet>
-		    <AvaloniaVersion>11.3.8</AvaloniaVersion>
+		    <AvaloniaVersion>11.3.9-cibuild0004031-alpha</AvaloniaVersion>
     </PropertyGroup>
   
   <PropertyGroup Condition="$([MSBuild]::IsOsPlatform('Windows')) AND '$(Platform)' == 'x64'">

+ 1 - 0
src/PixiEditor/Views/Auth/LoginForm.axaml

@@ -8,6 +8,7 @@
              xmlns:xaml="clr-namespace:PixiEditor.Models.Commands.XAML"
              xmlns:ui="clr-namespace:PixiEditor.UI.Common.Localization;assembly=PixiEditor.UI.Common"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:DataType="subViewModels:UserViewModel"
              x:Class="PixiEditor.Views.Auth.LoginForm">
     <Design.DataContext>
         <subViewModels:UserViewModel />

+ 1 - 0
src/PixiEditor/Views/Auth/UserAvatarToggle.axaml

@@ -11,6 +11,7 @@
              xmlns:converters="clr-namespace:PixiEditor.Helpers.Converters"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:ClassModifier="internal"
+             x:DataType="subViewModels:UserViewModel"
              x:Class="PixiEditor.Views.Auth.UserAvatarToggle">
     <Design.DataContext>
         <subViewModels:UserViewModel />

+ 1 - 0
src/PixiEditor/Views/Dialogs/Debugging/Localization/LocalizationDebugWindow.axaml

@@ -15,6 +15,7 @@
                          Width="600"
                          Height="400"
                          x:Class="PixiEditor.Views.Dialogs.Debugging.Localization.LocalizationDebugWindow"
+                         x:DataType="localization1:LocalizationDataContext"
                          Title="LOCALIZATION_DEBUG_WINDOW_TITLE">
     <StackPanel Grid.Row="1" Margin="5">
         <StackPanel Orientation="Horizontal" Height="25">

+ 1 - 0
src/PixiEditor/Views/Dialogs/OnboardingDialog.axaml

@@ -12,6 +12,7 @@
         xmlns:ui1="clr-namespace:PixiEditor.Extensions.UI;assembly=PixiEditor.Extensions"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         x:Class="PixiEditor.Views.Dialogs.OnboardingDialog"
+        x:DataType="userPreferences:OnboardingViewModel"
         ShowInTaskbar="False"
         CanResize="False"
         SystemDecorations="BorderOnly"

+ 1 - 0
src/PixiEditor/Views/Nodes/Properties/VecDPropertyView.axaml

@@ -9,6 +9,7 @@
                              xmlns:controls="clr-namespace:PixiEditor.UI.Common.Controls;assembly=PixiEditor.UI.Common"
                              xmlns:properties1="clr-namespace:PixiEditor.ViewModels.Nodes.Properties"
                              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+                             x:DataType="properties1:VecDPropertyViewModel"
                              x:Class="PixiEditor.Views.Nodes.Properties.VecDPropertyView">
     <Design.DataContext>
         <properties1:VecDPropertyViewModel />

+ 9 - 0
src/nuget.config

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <!--To inherit the global NuGet package sources remove the <clear/> line below -->
+    <clear />
+    <add key="nuget" value="https://api.nuget.org/v3/index.json" />
+    <add key="PixiloniaNugetFeed" value="https://pkgs.dev.azure.com/flabbet/Pixilonia/_packaging/PixiloniaNugetFeed/nuget/v3/index.json" />
+  </packageSources>
+</configuration>