fix: FIx more build warnings and WPF designer runtime errors

matherm-aboehm · unchase · commit 1015464f059d · 2023-06-05T16:26:08.000+03:00
Exclude "compile" assets from packages that have reference assemblies, so that only implementation assemblies are used. This fixes WPF designer errors about loading reference assemblies on non-reflection context.
Remove double usage of image files in shared project, because "Resource" and "Content" build action are redundant.
diff --git a/src/Unchase.OpenAPI.Connectedservice.Shared/Common/Commands/StackPanelChangeVisibilityCommand.cs b/src/Unchase.OpenAPI.Connectedservice.Shared/Common/Commands/StackPanelChangeVisibilityCommand.cs
@@ -7,16 +7,17 @@ namespace Unchase.OpenAPI.ConnectedService.Common.Commands
     class StackPanelChangeVisibilityCommand :
         ICommand
     {
-        public bool CanExecute(object parameter)
+
+        bool ICommand.CanExecute(object parameter)
         {
             return true;
         }
 
-        public void Execute(object parameter)
+        void ICommand.Execute(object parameter)
         {
             (parameter as StackPanel)?.ChangeStackPanelVisibility();
         }
 
-        public event EventHandler CanExecuteChanged;
+        event EventHandler ICommand.CanExecuteChanged { add { } remove { } }
     }
 }
diff --git a/src/Unchase.OpenAPI.Connectedservice.Shared/Unchase.OpenAPI.Connectedservice.Shared.projitems b/src/Unchase.OpenAPI.Connectedservice.Shared/Unchase.OpenAPI.Connectedservice.Shared.projitems
@@ -67,10 +67,6 @@
     <Content Include="$(MSBuildThisFileDirectory)Resources\logo_128x128.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="$(MSBuildThisFileDirectory)Resources\NewBug.png">
-      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-    </Content>
-    <Content Include="$(MSBuildThisFileDirectory)Resources\preview_200x200.png" />
     <Resource Include="$(MSBuildThisFileDirectory)Resources\preview_200x200.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
@@ -84,7 +80,9 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="$(MSBuildThisFileDirectory)Resources\NewBug.png" />
+    <Resource Include="$(MSBuildThisFileDirectory)Resources\NewBug.png">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </Resource>
   </ItemGroup>
   <ItemGroup>
     <Page Include="$(MSBuildThisFileDirectory)Views\ConfigOpenApiEndpoint.xaml">
diff --git a/src/Unchase.OpenAPI.Connectedservice.Shared/ViewModels/ConfigOpenApiEndpointViewModel.cs b/src/Unchase.OpenAPI.Connectedservice.Shared/ViewModels/ConfigOpenApiEndpointViewModel.cs
@@ -115,7 +115,7 @@ public ConfigOpenApiEndpointViewModel(UserSettings userSettings, Wizard wizard)
             Description = "Enter or choose an specification endpoint and check generation options to begin";
             Legend = "Specification Endpoint";
             InternalWizard = wizard;
-            View = new ConfigOpenApiEndpoint(InternalWizard) {DataContext = this};
+            View = new ConfigOpenApiEndpoint(InternalWizard) { DataContext = this };
             UserSettings = userSettings;
             ServiceName = string.IsNullOrWhiteSpace(userSettings.ServiceName) ? Constants.DefaultServiceName : userSettings.ServiceName;
             AcceptAllUntrustedCertificates = userSettings.AcceptAllUntrustedCertificates;
@@ -197,19 +197,17 @@ internal async Task<string> GetSpecificationAsync()
                         UserSettings.Endpoint = UserSettings.Endpoint.TrimEnd('/') + "/$metadata";
                     }
 
-                    var proxy = UseWebProxy
-                        ? new WebProxy(WebProxyUri, true)
-                        : WebProxy.GetDefaultProxy();
-
-                    proxy.Credentials = UseWebProxy && UseWebProxyCredentials
-                        ? new NetworkCredential(WebProxyNetworkCredentialsUserName,
-                            WebProxyNetworkCredentialsPassword, WebProxyNetworkCredentialsDomain)
-                        : CredentialCache.DefaultCredentials;
 
                     var httpHandler = new HttpClientHandler();
 
                     if (UseWebProxy)
                     {
+                        var proxy = new WebProxy(WebProxyUri, true); /*WebRequest.DefaultWebProxy*/
+
+                        proxy.Credentials = UseWebProxyCredentials
+                            ? new NetworkCredential(WebProxyNetworkCredentialsUserName,
+                                WebProxyNetworkCredentialsPassword, WebProxyNetworkCredentialsDomain)
+                            : CredentialCache.DefaultCredentials;
                         httpHandler.UseProxy = UseWebProxy;
                         httpHandler.Proxy = proxy;
                         httpHandler.PreAuthenticate = UseWebProxy;
diff --git a/src/Unchase.OpenAPI.Connectedservice.VS22/Unchase.OpenAPI.Connectedservice.VS22.csproj b/src/Unchase.OpenAPI.Connectedservice.VS22/Unchase.OpenAPI.Connectedservice.VS22.csproj
@@ -94,15 +94,45 @@
       <Version>17.0.31902.203</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.0.5233" />
+    <PackageReference Include="Microsoft.Win32.Registry">
+      <Version>5.0.0</Version>
+      <PrivateAssets>compile; contentfiles; build; analyzers</PrivateAssets>
+      <ExcludeAssets>compile</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Win32.Registry.AccessControl">
+      <Version>5.0.0</Version>
+      <PrivateAssets>compile; contentfiles; build; analyzers</PrivateAssets>
+      <ExcludeAssets>compile</ExcludeAssets>
+    </PackageReference>
     <PackageReference Include="NSwag.Commands">
       <Version>13.18.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.VisualStudio">
       <Version>6.0.0</Version>
     </PackageReference>
+    <PackageReference Include="System.Numerics.Vectors">
+      <Version>4.5.0</Version>
+      <PrivateAssets>compile; contentfiles; build; analyzers</PrivateAssets>
+      <ExcludeAssets>compile</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="System.Security.AccessControl">
+      <Version>5.0.0</Version>
+      <PrivateAssets>compile; contentfiles; build; analyzers</PrivateAssets>
+      <ExcludeAssets>compile</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="System.Security.Principal.Windows">
+      <Version>5.0.0</Version>
+      <PrivateAssets>compile; contentfiles; build; analyzers</PrivateAssets>
+      <ExcludeAssets>compile</ExcludeAssets>
+    </PackageReference>
     <PackageReference Include="System.Text.Json">
       <Version>6.0.0</Version>
     </PackageReference>
+    <PackageReference Include="System.Threading.AccessControl">
+      <Version>5.0.0</Version>
+      <PrivateAssets>compile; contentfiles; build; analyzers</PrivateAssets>
+      <ExcludeAssets>compile</ExcludeAssets>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Properties\Resources.resx">
diff --git a/src/Unchase.OpenAPI.Connectedservice/Unchase.OpenAPI.ConnectedService.csproj b/src/Unchase.OpenAPI.Connectedservice/Unchase.OpenAPI.ConnectedService.csproj
@@ -284,6 +284,11 @@
     <PackageReference Include="System.Diagnostics.DiagnosticSource">
       <Version>4.6.0</Version>
     </PackageReference>
+    <PackageReference Include="System.Numerics.Vectors">
+      <Version>4.5.0</Version>
+      <PrivateAssets>compile; contentfiles; build; analyzers</PrivateAssets>
+      <ExcludeAssets>compile</ExcludeAssets>
+    </PackageReference>
     <PackageReference Include="System.Reflection.Metadata">
       <Version>1.7.0</Version>
     </PackageReference>

Original file line number	Diff line number	Diff line change
`@@ -7,16 +7,17 @@ namespace Unchase.OpenAPI.ConnectedService.Common.Commands`
`7`	`7`	`class StackPanelChangeVisibilityCommand :`
`8`	`8`	`ICommand`
`9`	`9`	`{`
`10`		`- public bool CanExecute(object parameter)`
	`10`	`+`
	`11`	`+ bool ICommand.CanExecute(object parameter)`
`11`	`12`	`{`
`12`	`13`	`return true;`
`13`	`14`	`}`
`14`	`15`
`15`		`- public void Execute(object parameter)`
	`16`	`+ void ICommand.Execute(object parameter)`
`16`	`17`	`{`
`17`	`18`	`(parameter as StackPanel)?.ChangeStackPanelVisibility();`
`18`	`19`	`}`
`19`	`20`
`20`		`- public event EventHandler CanExecuteChanged;`
	`21`	`+ event EventHandler ICommand.CanExecuteChanged { add { } remove { } }`
`21`	`22`	`}`
`22`	`23`	`}`