Fix load errors

tom-englert · tom-englert · commit f33d65bd2bc3 · 2019-08-21T15:22:00.000+02:00
diff --git a/ResXManager.VSIX/Properties/AssemblyInfo.cs b/ResXManager.VSIX/Properties/AssemblyInfo.cs
@@ -13,6 +13,8 @@
 [assembly: CLSCompliant(false)]
 [assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.MainAssembly)]
 
+[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\TomsToolbox.Essentials.dll")]
+[assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\TomsToolbox.Wpf.dll")]
 [assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\TomsToolbox.Wpf.Styles.dll")]
 [assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\TomsToolbox.Wpf.Composition.Styles.dll")]
 [assembly: ProvideCodeBase(CodeBase = "$PackageFolder$\\System.Windows.Interactivity.dll")]
diff --git a/ResXManager.View/Visuals/ResourceView.xaml.cs b/ResXManager.View/Visuals/ResourceView.xaml.cs
@@ -56,7 +56,7 @@ public ResourceView([NotNull] IExportProvider exportProvider)
 
                 InitializeComponent();
 
-                DataGrid.SetupColumns(_resourceManager, _resourceViewModel, _configuration);
+                DataGrid?.SetupColumns(_resourceManager, _resourceViewModel, _configuration);
             }
             catch (Exception ex)
             {
@@ -79,7 +79,7 @@ private void ResourceViewModel_ClearFiltersRequest(object sender, [NotNull] Reso
 
         private void ResourceManager_Loaded([NotNull] object sender, [NotNull] EventArgs e)
         {
-            DataGrid.SetupColumns(_resourceManager, _resourceViewModel, _configuration);
+            DataGrid?.SetupColumns(_resourceManager, _resourceViewModel, _configuration);
         }
 
         private void AddLanguage_Click([NotNull] object sender, [NotNull] RoutedEventArgs e)

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public ResourceView([NotNull] IExportProvider exportProvider)`
`56`	`56`
`57`	`57`	`InitializeComponent();`
`58`	`58`
`59`		`- DataGrid.SetupColumns(_resourceManager, _resourceViewModel, _configuration);`
	`59`	`+ DataGrid?.SetupColumns(_resourceManager, _resourceViewModel, _configuration);`
`60`	`60`	`}`
`61`	`61`	`catch (Exception ex)`
`62`	`62`	`{`
`@@ -79,7 +79,7 @@ private void ResourceViewModel_ClearFiltersRequest(object sender, [NotNull] Reso`
`79`	`79`
`80`	`80`	`private void ResourceManager_Loaded([NotNull] object sender, [NotNull] EventArgs e)`
`81`	`81`	`{`
`82`		`- DataGrid.SetupColumns(_resourceManager, _resourceViewModel, _configuration);`
	`82`	`+ DataGrid?.SetupColumns(_resourceManager, _resourceViewModel, _configuration);`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`private void AddLanguage_Click([NotNull] object sender, [NotNull] RoutedEventArgs e)`