diff --git a/Directory.Build.props b/Directory.Build.props
index e5d823626..3bb9b7811 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -37,6 +37,7 @@
$(MSBuildProjectName.Contains('Uno'))
$(MSBuildProjectName.Contains('Forms'))
$(MSBuildProjectName.Contains('Maui'))
+ $(MSBuildProjectName.Contains('Avalonia'))
True
$(MSBuildThisFileDirectory)prism.snk
False
@@ -49,6 +50,7 @@
prism;mvvm;wpf;dependency injection;di
prism;mvvm;winui;uno-platform;xamarin;webassembly;android;ios;macos;dependency injection;di
prism;mvvm;uwp;android;ios;xamarin;xamarin.forms;dependency injection;di
+ prism;mvvm;desktop;linux;macos;avalonia;dependency injection;di
false
false
$(IsWpfProject)
diff --git a/Directory.Packages.props b/Directory.Packages.props
index d5f281e5d..75ff17a37 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -56,7 +56,20 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/PrismLibrary.sln b/PrismLibrary.sln
index 073d6eb59..8270c1d3b 100644
--- a/PrismLibrary.sln
+++ b/PrismLibrary.sln
@@ -1,4 +1,3 @@
-
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.4.33213.308
@@ -93,6 +92,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Events", "src\Prism.E
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Uno.WinUI.Markup", "src\Uno\Prism.Uno.Markup\Prism.Uno.WinUI.Markup.csproj", "{0EA416B6-0AB6-464B-9F4D-206FFCFB262D}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Avalonia", "Avalonia", "{8AE1015F-4D62-47EF-A576-2F7411EC20D5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Avalonia", "src\Avalonia\Prism.Avalonia\Prism.Avalonia.csproj", "{C505C63F-99E6-464F-8C83-1AE4239C19B1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.DryIoc.Avalonia", "src\Avalonia\Prism.DryIoc.Avalonia\Prism.DryIoc.Avalonia.csproj", "{A6B7B19C-3288-4CD2-A737-527BEB1ED807}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -415,6 +420,30 @@ Global
{0EA416B6-0AB6-464B-9F4D-206FFCFB262D}.Release|x64.Build.0 = Release|Any CPU
{0EA416B6-0AB6-464B-9F4D-206FFCFB262D}.Release|x86.ActiveCfg = Release|Any CPU
{0EA416B6-0AB6-464B-9F4D-206FFCFB262D}.Release|x86.Build.0 = Release|Any CPU
+ {C505C63F-99E6-464F-8C83-1AE4239C19B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C505C63F-99E6-464F-8C83-1AE4239C19B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C505C63F-99E6-464F-8C83-1AE4239C19B1}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {C505C63F-99E6-464F-8C83-1AE4239C19B1}.Debug|x64.Build.0 = Debug|Any CPU
+ {C505C63F-99E6-464F-8C83-1AE4239C19B1}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {C505C63F-99E6-464F-8C83-1AE4239C19B1}.Debug|x86.Build.0 = Debug|Any CPU
+ {C505C63F-99E6-464F-8C83-1AE4239C19B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C505C63F-99E6-464F-8C83-1AE4239C19B1}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C505C63F-99E6-464F-8C83-1AE4239C19B1}.Release|x64.ActiveCfg = Release|Any CPU
+ {C505C63F-99E6-464F-8C83-1AE4239C19B1}.Release|x64.Build.0 = Release|Any CPU
+ {C505C63F-99E6-464F-8C83-1AE4239C19B1}.Release|x86.ActiveCfg = Release|Any CPU
+ {C505C63F-99E6-464F-8C83-1AE4239C19B1}.Release|x86.Build.0 = Release|Any CPU
+ {A6B7B19C-3288-4CD2-A737-527BEB1ED807}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A6B7B19C-3288-4CD2-A737-527BEB1ED807}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A6B7B19C-3288-4CD2-A737-527BEB1ED807}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {A6B7B19C-3288-4CD2-A737-527BEB1ED807}.Debug|x64.Build.0 = Debug|Any CPU
+ {A6B7B19C-3288-4CD2-A737-527BEB1ED807}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {A6B7B19C-3288-4CD2-A737-527BEB1ED807}.Debug|x86.Build.0 = Debug|Any CPU
+ {A6B7B19C-3288-4CD2-A737-527BEB1ED807}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A6B7B19C-3288-4CD2-A737-527BEB1ED807}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A6B7B19C-3288-4CD2-A737-527BEB1ED807}.Release|x64.ActiveCfg = Release|Any CPU
+ {A6B7B19C-3288-4CD2-A737-527BEB1ED807}.Release|x64.Build.0 = Release|Any CPU
+ {A6B7B19C-3288-4CD2-A737-527BEB1ED807}.Release|x86.ActiveCfg = Release|Any CPU
+ {A6B7B19C-3288-4CD2-A737-527BEB1ED807}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -455,6 +484,9 @@ Global
{8711D306-1118-4A11-9399-EF14AA13015E} = {540CEEC1-D541-4614-BF0B-18056A83E434}
{8610485A-BE9F-4938-86D4-E9F1FA1739A0} = {F3664D7A-6FF5-4D1F-9F5F-26EE87F032D3}
{0EA416B6-0AB6-464B-9F4D-206FFCFB262D} = {8F959801-D494-4CAF-9437-90F30472E169}
+ {8AE1015F-4D62-47EF-A576-2F7411EC20D5} = {F3664D7A-6FF5-4D1F-9F5F-26EE87F032D3}
+ {C505C63F-99E6-464F-8C83-1AE4239C19B1} = {8AE1015F-4D62-47EF-A576-2F7411EC20D5}
+ {A6B7B19C-3288-4CD2-A737-527BEB1ED807} = {8AE1015F-4D62-47EF-A576-2F7411EC20D5}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C7433AE2-B1A0-4C1A-887E-5CAA7AAF67A6}
diff --git a/PrismLibrary_Avalonia.slnf b/PrismLibrary_Avalonia.slnf
index 1b49b7e34..c1b088990 100644
--- a/PrismLibrary_Avalonia.slnf
+++ b/PrismLibrary_Avalonia.slnf
@@ -1,14 +1,12 @@
{
"solution": {
- "path": "Prism.Avalonia.sln",
+ "path": "PrismLibrary.sln",
"projects": [
"src\\Containers\\Prism.DryIoc.Shared\\Prism.DryIoc.Shared.shproj",
"src\\Avalonia\\Prism.Avalonia\\Prism.Avalonia.csproj",
"src\\Avalonia\\Prism.DryIoc.Avalonia\\Prism.DryIoc.Avalonia.csproj",
"tests\\Avalonia\\Prism.Avalonia.Tests\\Prism.Avalonia.Tests.csproj",
- "tests\\Avalonia\\Prism.Container.Avalonia.Shared\\Prism.Container.Avalonia.Shared.shproj",
- "tests\\Avalonia\\Prism.DryIoc.Avalonia.Tests\\Prism.DryIoc.Avalonia.Tests.csproj",
- "tests\\Avalonia\\Prism.IocContainer.Avalonia.Tests.Support\\Prism.IocContainer.Avalonia.Tests.Support.csproj"
+ "tests\\Avalonia\\Prism.DryIoc.Avalonia.Tests\\Prism.DryIoc.Avalonia.Tests.csproj"
]
}
}
\ No newline at end of file
diff --git a/src/Avalonia/Prism.Avalonia/Prism.Avalonia.csproj b/src/Avalonia/Prism.Avalonia/Prism.Avalonia.csproj
index ccd31efc1..54a3b994d 100644
--- a/src/Avalonia/Prism.Avalonia/Prism.Avalonia.csproj
+++ b/src/Avalonia/Prism.Avalonia/Prism.Avalonia.csproj
@@ -1,10 +1,5 @@
-
+
-
-
-
-
-
Properties
Prism
@@ -33,10 +28,10 @@ Prism.Avalonia helps you more easily design and build rich, flexible, and easy t
-
+
True
\
@@ -51,4 +46,33 @@ Prism.Avalonia helps you more easily design and build rich, flexible, and easy t
+
+
+
+ True
+ True
+ Resources.resx
+
+
+
+
+
+ PublicResXFileCodeGenerator
+ Resources.Designer.cs
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Avalonia/Prism.Avalonia/Properties/Resources.Designer.cs b/src/Avalonia/Prism.Avalonia/Properties/Resources.Designer.cs
index 0d55e231c..325cda013 100644
--- a/src/Avalonia/Prism.Avalonia/Properties/Resources.Designer.cs
+++ b/src/Avalonia/Prism.Avalonia/Properties/Resources.Designer.cs
@@ -19,10 +19,10 @@ namespace Prism.Properties {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- internal class Resources {
+ public class Resources {
private static global::System.Resources.ResourceManager resourceMan;
@@ -36,7 +36,7 @@ internal Resources() {
/// Returns the cached ResourceManager instance used by this class.
///
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Resources.ResourceManager ResourceManager {
+ public static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Prism.Properties.Resources", typeof(Resources).Assembly);
@@ -51,7 +51,7 @@ internal Resources() {
/// resource lookups using this strongly typed resource class.
///
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Globalization.CultureInfo Culture {
+ public static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
@@ -63,7 +63,7 @@ internal Resources() {
///
/// Looks up a localized string similar to The object must be of type '{0}' in order to use the current region adapter..
///
- internal static string AdapterInvalidTypeException {
+ public static string AdapterInvalidTypeException {
get {
return ResourceManager.GetString("AdapterInvalidTypeException", resourceCulture);
}
@@ -72,7 +72,7 @@ internal static string AdapterInvalidTypeException {
///
/// Looks up a localized string similar to Cannot change the region name once is set. The current region name is '{0}'..
///
- internal static string CannotChangeRegionNameException {
+ public static string CannotChangeRegionNameException {
get {
return ResourceManager.GetString("CannotChangeRegionNameException", resourceCulture);
}
@@ -81,7 +81,7 @@ internal static string CannotChangeRegionNameException {
///
/// Looks up a localized string similar to Cannot create navigation target '{0}'..
///
- internal static string CannotCreateNavigationTarget {
+ public static string CannotCreateNavigationTarget {
get {
return ResourceManager.GetString("CannotCreateNavigationTarget", resourceCulture);
}
@@ -90,7 +90,7 @@ internal static string CannotCreateNavigationTarget {
///
/// Looks up a localized string similar to Type '{0}' does not implement from IRegionBehavior..
///
- internal static string CanOnlyAddTypesThatInheritIFromRegionBehavior {
+ public static string CanOnlyAddTypesThatInheritIFromRegionBehavior {
get {
return ResourceManager.GetString("CanOnlyAddTypesThatInheritIFromRegionBehavior", resourceCulture);
}
@@ -99,7 +99,7 @@ internal static string CanOnlyAddTypesThatInheritIFromRegionBehavior {
///
/// Looks up a localized string similar to The ConfigurationStore cannot contain a null value. .
///
- internal static string ConfigurationStoreCannotBeNull {
+ public static string ConfigurationStoreCannotBeNull {
get {
return ResourceManager.GetString("ConfigurationStoreCannotBeNull", resourceCulture);
}
@@ -111,7 +111,7 @@ internal static string ConfigurationStoreCannotBeNull {
/// If you did not explicitly set the control's Content property,
/// this exception may be caused by a change in the value of the inherited RegionManager attached property..
///
- internal static string ContentControlHasContentException {
+ public static string ContentControlHasContentException {
get {
return ResourceManager.GetString("ContentControlHasContentException", resourceCulture);
}
@@ -120,7 +120,7 @@ internal static string ContentControlHasContentException {
///
/// Looks up a localized string similar to Deactivation is not possible in this type of region..
///
- internal static string DeactiveNotPossibleException {
+ public static string DeactiveNotPossibleException {
get {
return ResourceManager.GetString("DeactiveNotPossibleException", resourceCulture);
}
@@ -129,7 +129,7 @@ internal static string DeactiveNotPossibleException {
///
/// Looks up a localized string similar to {1}: {2}. Priority: {3}. Timestamp:{0:u}..
///
- internal static string DefaultTextLoggerPattern {
+ public static string DefaultTextLoggerPattern {
get {
return ResourceManager.GetString("DefaultTextLoggerPattern", resourceCulture);
}
@@ -138,7 +138,7 @@ internal static string DefaultTextLoggerPattern {
///
/// Looks up a localized string similar to Neither the executeMethod nor the canExecuteMethod delegates can be null..
///
- internal static string DelegateCommandDelegatesCannotBeNull {
+ public static string DelegateCommandDelegatesCannotBeNull {
get {
return ResourceManager.GetString("DelegateCommandDelegatesCannotBeNull", resourceCulture);
}
@@ -147,7 +147,7 @@ internal static string DelegateCommandDelegatesCannotBeNull {
///
/// Looks up a localized string similar to T for DelegateCommand<T> is not an object nor Nullable..
///
- internal static string DelegateCommandInvalidGenericPayloadType {
+ public static string DelegateCommandInvalidGenericPayloadType {
get {
return ResourceManager.GetString("DelegateCommandInvalidGenericPayloadType", resourceCulture);
}
@@ -156,7 +156,7 @@ internal static string DelegateCommandInvalidGenericPayloadType {
///
/// Looks up a localized string similar to Directory {0} was not found..
///
- internal static string DirectoryNotFound {
+ public static string DirectoryNotFound {
get {
return ResourceManager.GetString("DirectoryNotFound", resourceCulture);
}
@@ -165,7 +165,7 @@ internal static string DirectoryNotFound {
///
/// Looks up a localized string similar to A duplicated module group with name {0} has been found by the loader..
///
- internal static string DuplicatedModuleGroup {
+ public static string DuplicatedModuleGroup {
get {
return ResourceManager.GetString("DuplicatedModuleGroup", resourceCulture);
}
@@ -174,7 +174,7 @@ internal static string DuplicatedModuleGroup {
///
/// Looks up a localized string similar to Unable to retrieve the module type {0} from the loaded assemblies. You may need to specify a more fully-qualified type name..
///
- internal static string FailedToGetType {
+ public static string FailedToGetType {
get {
return ResourceManager.GetString("FailedToGetType", resourceCulture);
}
@@ -183,7 +183,7 @@ internal static string FailedToGetType {
///
/// Looks up a localized string similar to HostControl cannot have null value when behavior attaches. .
///
- internal static string HostControlCannotBeNull {
+ public static string HostControlCannotBeNull {
get {
return ResourceManager.GetString("HostControlCannotBeNull", resourceCulture);
}
@@ -192,7 +192,7 @@ internal static string HostControlCannotBeNull {
///
/// Looks up a localized string similar to The HostControl property cannot be set after Attach method has been called..
///
- internal static string HostControlCannotBeSetAfterAttach {
+ public static string HostControlCannotBeSetAfterAttach {
get {
return ResourceManager.GetString("HostControlCannotBeSetAfterAttach", resourceCulture);
}
@@ -201,7 +201,7 @@ internal static string HostControlCannotBeSetAfterAttach {
///
/// Looks up a localized string similar to HostControl type must be a TabControl..
///
- internal static string HostControlMustBeATabControl {
+ public static string HostControlMustBeATabControl {
get {
return ResourceManager.GetString("HostControlMustBeATabControl", resourceCulture);
}
@@ -210,7 +210,7 @@ internal static string HostControlMustBeATabControl {
///
/// Looks up a localized string similar to The IModuleEnumerator interface is no longer used and has been replaced by ModuleCatalog..
///
- internal static string IEnumeratorObsolete {
+ public static string IEnumeratorObsolete {
get {
return ResourceManager.GetString("IEnumeratorObsolete", resourceCulture);
}
@@ -219,7 +219,7 @@ internal static string IEnumeratorObsolete {
///
/// Looks up a localized string similar to The argument must be a valid absolute Uri to an assembly file..
///
- internal static string InvalidArgumentAssemblyUri {
+ public static string InvalidArgumentAssemblyUri {
get {
return ResourceManager.GetString("InvalidArgumentAssemblyUri", resourceCulture);
}
@@ -228,7 +228,7 @@ internal static string InvalidArgumentAssemblyUri {
///
/// Looks up a localized string similar to The Target of the IDelegateReference should be of type {0}..
///
- internal static string InvalidDelegateRerefenceTypeException {
+ public static string InvalidDelegateRerefenceTypeException {
get {
return ResourceManager.GetString("InvalidDelegateRerefenceTypeException", resourceCulture);
}
@@ -240,7 +240,7 @@ internal static string InvalidDelegateRerefenceTypeException {
/// If you did not explicitly set the control's ItemSource property,
/// this exception may be caused by a change in the value of the inherited RegionManager attached property..
///
- internal static string ItemsControlHasItemsSourceException {
+ public static string ItemsControlHasItemsSourceException {
get {
return ResourceManager.GetString("ItemsControlHasItemsSourceException", resourceCulture);
}
@@ -249,7 +249,7 @@ internal static string ItemsControlHasItemsSourceException {
///
/// Looks up a localized string similar to Mapping with the given type is already registered: {0}..
///
- internal static string MappingExistsException {
+ public static string MappingExistsException {
get {
return ResourceManager.GetString("MappingExistsException", resourceCulture);
}
@@ -258,7 +258,7 @@ internal static string MappingExistsException {
///
/// Looks up a localized string similar to Module {0} was not found in the catalog..
///
- internal static string ModuleNotFound {
+ public static string ModuleNotFound {
get {
return ResourceManager.GetString("ModuleNotFound", resourceCulture);
}
@@ -267,7 +267,7 @@ internal static string ModuleNotFound {
///
/// Looks up a localized string similar to The ModulePath cannot contain a null value or be empty.
///
- internal static string ModulePathCannotBeNullOrEmpty {
+ public static string ModulePathCannotBeNullOrEmpty {
get {
return ResourceManager.GetString("ModulePathCannotBeNullOrEmpty", resourceCulture);
}
@@ -276,7 +276,7 @@ internal static string ModulePathCannotBeNullOrEmpty {
///
/// Looks up a localized string similar to Failed to load type '{0}' from assembly '{1}'..
///
- internal static string ModuleTypeNotFound {
+ public static string ModuleTypeNotFound {
get {
return ResourceManager.GetString("ModuleTypeNotFound", resourceCulture);
}
@@ -285,7 +285,7 @@ internal static string ModuleTypeNotFound {
///
/// Looks up a localized string similar to The ModuleCatalog must implement IModuleGroupCatalog to add groups.
///
- internal static string MustBeModuleGroupCatalog {
+ public static string MustBeModuleGroupCatalog {
get {
return ResourceManager.GetString("MustBeModuleGroupCatalog", resourceCulture);
}
@@ -294,7 +294,7 @@ internal static string MustBeModuleGroupCatalog {
///
/// Looks up a localized string similar to Navigation is already in progress on region with name '{0}'..
///
- internal static string NavigationInProgress {
+ public static string NavigationInProgress {
get {
return ResourceManager.GetString("NavigationInProgress", resourceCulture);
}
@@ -303,7 +303,7 @@ internal static string NavigationInProgress {
///
/// Looks up a localized string similar to Navigation cannot proceed until a region is set for the RegionNavigationService..
///
- internal static string NavigationServiceHasNoRegion {
+ public static string NavigationServiceHasNoRegion {
get {
return ResourceManager.GetString("NavigationServiceHasNoRegion", resourceCulture);
}
@@ -312,7 +312,7 @@ internal static string NavigationServiceHasNoRegion {
///
/// Looks up a localized string similar to The IRegionAdapter for the type {0} is not registered in the region adapter mappings. You can register an IRegionAdapter for this control by overriding the ConfigureRegionAdapterMappings method in the bootstrapper..
///
- internal static string NoRegionAdapterException {
+ public static string NoRegionAdapterException {
get {
return ResourceManager.GetString("NoRegionAdapterException", resourceCulture);
}
@@ -321,7 +321,7 @@ internal static string NoRegionAdapterException {
///
/// Looks up a localized string similar to There is currently no moduleTypeLoader in the ModuleManager that can retrieve the specified module..
///
- internal static string NoRetrieverCanRetrieveModule {
+ public static string NoRetrieverCanRetrieveModule {
get {
return ResourceManager.GetString("NoRetrieverCanRetrieveModule", resourceCulture);
}
@@ -332,7 +332,7 @@ internal static string NoRetrieverCanRetrieveModule {
/// - The most likely causing exception was was: '{1}'.
/// But also check the InnerExceptions for more detail or call .GetRootException(). .
///
- internal static string OnViewRegisteredException {
+ public static string OnViewRegisteredException {
get {
return ResourceManager.GetString("OnViewRegisteredException", resourceCulture);
}
@@ -341,7 +341,7 @@ internal static string OnViewRegisteredException {
///
/// Looks up a localized string similar to The member access expression does not access a property..
///
- internal static string PropertySupport_ExpressionNotProperty_Exception {
+ public static string PropertySupport_ExpressionNotProperty_Exception {
get {
return ResourceManager.GetString("PropertySupport_ExpressionNotProperty_Exception", resourceCulture);
}
@@ -350,7 +350,7 @@ internal static string PropertySupport_ExpressionNotProperty_Exception {
///
/// Looks up a localized string similar to The expression is not a member access expression..
///
- internal static string PropertySupport_NotMemberAccessExpression_Exception {
+ public static string PropertySupport_NotMemberAccessExpression_Exception {
get {
return ResourceManager.GetString("PropertySupport_NotMemberAccessExpression_Exception", resourceCulture);
}
@@ -359,7 +359,7 @@ internal static string PropertySupport_NotMemberAccessExpression_Exception {
///
/// Looks up a localized string similar to The referenced property is a static property..
///
- internal static string PropertySupport_StaticExpression_Exception {
+ public static string PropertySupport_StaticExpression_Exception {
get {
return ResourceManager.GetString("PropertySupport_StaticExpression_Exception", resourceCulture);
}
@@ -368,7 +368,7 @@ internal static string PropertySupport_StaticExpression_Exception {
///
/// Looks up a localized string similar to The Attach method cannot be called when Region property is null..
///
- internal static string RegionBehaviorAttachCannotBeCallWithNullRegion {
+ public static string RegionBehaviorAttachCannotBeCallWithNullRegion {
get {
return ResourceManager.GetString("RegionBehaviorAttachCannotBeCallWithNullRegion", resourceCulture);
}
@@ -377,7 +377,7 @@ internal static string RegionBehaviorAttachCannotBeCallWithNullRegion {
///
/// Looks up a localized string similar to The Region property cannot be set after Attach method has been called..
///
- internal static string RegionBehaviorRegionCannotBeSetAfterAttach {
+ public static string RegionBehaviorRegionCannotBeSetAfterAttach {
get {
return ResourceManager.GetString("RegionBehaviorRegionCannotBeSetAfterAttach", resourceCulture);
}
@@ -386,7 +386,7 @@ internal static string RegionBehaviorRegionCannotBeSetAfterAttach {
///
/// Looks up a localized string similar to An exception occurred while creating a region with name '{0}'. The exception was: {1}. .
///
- internal static string RegionCreationException {
+ public static string RegionCreationException {
get {
return ResourceManager.GetString("RegionCreationException", resourceCulture);
}
@@ -395,7 +395,7 @@ internal static string RegionCreationException {
///
/// Looks up a localized string similar to The region being added already has a name of '{0}' and cannot be added to the region manager with a different name ('{1}')..
///
- internal static string RegionManagerWithDifferentNameException {
+ public static string RegionManagerWithDifferentNameException {
get {
return ResourceManager.GetString("RegionManagerWithDifferentNameException", resourceCulture);
}
@@ -404,7 +404,7 @@ internal static string RegionManagerWithDifferentNameException {
///
/// Looks up a localized string similar to The region name cannot be null or empty..
///
- internal static string RegionNameCannotBeEmptyException {
+ public static string RegionNameCannotBeEmptyException {
get {
return ResourceManager.GetString("RegionNameCannotBeEmptyException", resourceCulture);
}
@@ -413,7 +413,7 @@ internal static string RegionNameCannotBeEmptyException {
///
/// Looks up a localized string similar to Region with the given name is already registered: {0}.
///
- internal static string RegionNameExistsException {
+ public static string RegionNameExistsException {
get {
return ResourceManager.GetString("RegionNameExistsException", resourceCulture);
}
@@ -422,7 +422,7 @@ internal static string RegionNameExistsException {
///
/// Looks up a localized string similar to This RegionManager does not contain a Region with the name '{0}'..
///
- internal static string RegionNotFound {
+ public static string RegionNotFound {
get {
return ResourceManager.GetString("RegionNotFound", resourceCulture);
}
@@ -431,7 +431,7 @@ internal static string RegionNotFound {
///
/// Looks up a localized string similar to The region manager does not contain the {0} region..
///
- internal static string RegionNotInRegionManagerException {
+ public static string RegionNotInRegionManagerException {
get {
return ResourceManager.GetString("RegionNotInRegionManagerException", resourceCulture);
}
@@ -440,7 +440,7 @@ internal static string RegionNotInRegionManagerException {
///
/// Looks up a localized string similar to View already exists in region..
///
- internal static string RegionViewExistsException {
+ public static string RegionViewExistsException {
get {
return ResourceManager.GetString("RegionViewExistsException", resourceCulture);
}
@@ -449,7 +449,7 @@ internal static string RegionViewExistsException {
///
/// Looks up a localized string similar to View with name '{0}' already exists in the region..
///
- internal static string RegionViewNameExistsException {
+ public static string RegionViewNameExistsException {
get {
return ResourceManager.GetString("RegionViewNameExistsException", resourceCulture);
}
@@ -458,7 +458,7 @@ internal static string RegionViewNameExistsException {
///
/// Looks up a localized string similar to The provided String argument {0} must not be null or empty..
///
- internal static string StringCannotBeNullOrEmpty {
+ public static string StringCannotBeNullOrEmpty {
get {
return ResourceManager.GetString("StringCannotBeNullOrEmpty", resourceCulture);
}
@@ -467,7 +467,7 @@ internal static string StringCannotBeNullOrEmpty {
///
/// Looks up a localized string similar to The provided String argument {0} must not be null or empty..
///
- internal static string StringCannotBeNullOrEmpty1 {
+ public static string StringCannotBeNullOrEmpty1 {
get {
return ResourceManager.GetString("StringCannotBeNullOrEmpty1", resourceCulture);
}
@@ -476,7 +476,7 @@ internal static string StringCannotBeNullOrEmpty1 {
///
/// Looks up a localized string similar to No BehaviorType with key '{0}' was registered..
///
- internal static string TypeWithKeyNotRegistered {
+ public static string TypeWithKeyNotRegistered {
get {
return ResourceManager.GetString("TypeWithKeyNotRegistered", resourceCulture);
}
@@ -487,7 +487,7 @@ internal static string TypeWithKeyNotRegistered {
/// - The most likely causing exception was: '{0}'.
/// But also check the InnerExceptions for more detail or call .GetRootException(). .
///
- internal static string UpdateRegionException {
+ public static string UpdateRegionException {
get {
return ResourceManager.GetString("UpdateRegionException", resourceCulture);
}
@@ -496,7 +496,7 @@ internal static string UpdateRegionException {
///
/// Looks up a localized string similar to The value must be of type ModuleInfo..
///
- internal static string ValueMustBeOfTypeModuleInfo {
+ public static string ValueMustBeOfTypeModuleInfo {
get {
return ResourceManager.GetString("ValueMustBeOfTypeModuleInfo", resourceCulture);
}
@@ -505,7 +505,7 @@ internal static string ValueMustBeOfTypeModuleInfo {
///
/// Looks up a localized string similar to {0} not found..
///
- internal static string ValueNotFound {
+ public static string ValueNotFound {
get {
return ResourceManager.GetString("ValueNotFound", resourceCulture);
}
@@ -514,7 +514,7 @@ internal static string ValueNotFound {
///
/// Looks up a localized string similar to The region does not contain the specified view..
///
- internal static string ViewNotInRegionException {
+ public static string ViewNotInRegionException {
get {
return ResourceManager.GetString("ViewNotInRegionException", resourceCulture);
}
diff --git a/src/Avalonia/Prism.DryIoc.Avalonia/Prism.DryIoc.Avalonia.csproj b/src/Avalonia/Prism.DryIoc.Avalonia/Prism.DryIoc.Avalonia.csproj
index 9b31122e2..7d009ab52 100644
--- a/src/Avalonia/Prism.DryIoc.Avalonia/Prism.DryIoc.Avalonia.csproj
+++ b/src/Avalonia/Prism.DryIoc.Avalonia/Prism.DryIoc.Avalonia.csproj
@@ -1,8 +1,4 @@
-
-
-
-
-
+
Prism.DryIoc
@@ -17,22 +13,45 @@
-
+
True
\
+
-
+
+ True
+ True
+ Resources.resx
+
+
+
+
+
+ PublicResXFileCodeGenerator
+ Resources.Designer.cs
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Avalonia/Prism.DryIoc.Avalonia/Properties/Resources.Designer.cs b/src/Avalonia/Prism.DryIoc.Avalonia/Properties/Resources.Designer.cs
index 7fdd419bf..c18ad7756 100644
--- a/src/Avalonia/Prism.DryIoc.Avalonia/Properties/Resources.Designer.cs
+++ b/src/Avalonia/Prism.DryIoc.Avalonia/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace Prism.DryIoc.Properties {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
public class Resources {