Skip to content

Commit 2451fff

Browse files
ghost1372ghost1372
committed
filescoped namespace for vsix
1 parent 7335ffa commit 2451fff

22 files changed

Lines changed: 9668 additions & 6635 deletions

‎VSIX/DevWinUI_Template/DevWinUI_Template/Common/Constants.cs‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
namespace DevWinUI_Template
1+
namespace DevWinUI_Template;
2+
3+
public static class Constants
24
{
3-
public static class Constants
4-
{
5-
internal readonly static string DevWinUI_Core = "DevWinUI";
6-
internal readonly static string DevWinUI_Controls = "DevWinUI.Controls";
7-
internal readonly static string DevWinUI_ContextMenu = "DevWinUI.ContextMenu";
5+
internal readonly static string DevWinUI_Core = "DevWinUI";
6+
internal readonly static string DevWinUI_Controls = "DevWinUI.Controls";
7+
internal readonly static string DevWinUI_ContextMenu = "DevWinUI.ContextMenu";
88

9-
internal readonly static string DevWinUI_Controls_Xaml = "<ResourceDictionary Source=\"ms-appx:///DevWinUI.Controls/Themes/Generic.xaml\" />";
10-
}
9+
internal readonly static string DevWinUI_Controls_Xaml = "<ResourceDictionary Source=\"ms-appx:///DevWinUI.Controls/Themes/Generic.xaml\" />";
1110
}

‎VSIX/DevWinUI_Template/DevWinUI_Template/Common/NugetClientHelper.cs‎

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,43 +8,42 @@
88
using NuGet.Protocol.Core.Types;
99
using NuGet.Versioning;
1010

11-
namespace DevWinUI_Template
11+
namespace DevWinUI_Template;
12+
13+
public static class NugetClientHelper
1214
{
13-
public static class NugetClientHelper
14-
{
15-
private static ISettings? settings = Settings.LoadDefaultSettings(null);
16-
public static string globalPackagesFolder = SettingsUtility.GetGlobalPackagesFolder(settings);
15+
private static ISettings? settings = Settings.LoadDefaultSettings(null);
16+
public static string globalPackagesFolder = SettingsUtility.GetGlobalPackagesFolder(settings);
1717

18-
[System.Runtime.InteropServices.DllImport("wininet.dll")]
19-
private extern static bool InternetGetConnectedState(out int Description, int ReservedValue);
18+
[System.Runtime.InteropServices.DllImport("wininet.dll")]
19+
private extern static bool InternetGetConnectedState(out int Description, int ReservedValue);
2020

21-
public static bool IsInternetAvailable()
22-
{
23-
int desc;
24-
return InternetGetConnectedState(out desc, 0);
25-
}
21+
public static bool IsInternetAvailable()
22+
{
23+
int desc;
24+
return InternetGetConnectedState(out desc, 0);
25+
}
2626

27-
public async static Task<IPackageSearchMetadata> GetPackageMetaDataAsync(string packageId, bool includePrerelease = false)
28-
{
29-
var repository = Repository.Factory.GetCoreV3("https://api.nuget.org/v3/index.json");
30-
var resource = await repository.GetResourceAsync<PackageSearchResource>();
31-
var searchFilter = new SearchFilter(includePrerelease: includePrerelease);
27+
public async static Task<IPackageSearchMetadata> GetPackageMetaDataAsync(string packageId, bool includePrerelease = false)
28+
{
29+
var repository = Repository.Factory.GetCoreV3("https://api.nuget.org/v3/index.json");
30+
var resource = await repository.GetResourceAsync<PackageSearchResource>();
31+
var searchFilter = new SearchFilter(includePrerelease: includePrerelease);
3232

33-
var results = await resource.SearchAsync(
34-
packageId,
35-
searchFilter,
36-
skip: 0,
37-
take: 1,
38-
NullLogger.Instance,
39-
CancellationToken.None);
33+
var results = await resource.SearchAsync(
34+
packageId,
35+
searchFilter,
36+
skip: 0,
37+
take: 1,
38+
NullLogger.Instance,
39+
CancellationToken.None);
4040

41-
return results?.FirstOrDefault();
42-
}
43-
public static bool IsCacheAvailableForPackage(string packageId, string packageVersion)
44-
{
45-
NuGetVersion version = new NuGetVersion(packageVersion);
46-
var package = GlobalPackagesFolderUtility.GetPackage(new PackageIdentity(packageId, version), globalPackagesFolder);
47-
return package != null;
48-
}
41+
return results?.FirstOrDefault();
42+
}
43+
public static bool IsCacheAvailableForPackage(string packageId, string packageVersion)
44+
{
45+
NuGetVersion version = new NuGetVersion(packageVersion);
46+
var package = GlobalPackagesFolderUtility.GetPackage(new PackageIdentity(packageId, version), globalPackagesFolder);
47+
return package != null;
4948
}
5049
}

‎VSIX/DevWinUI_Template/DevWinUI_Template/Common/Options/ColorsDicOption.cs‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
using System.Collections.Generic;
22

3-
namespace DevWinUI_Template.Options
3+
namespace DevWinUI_Template.Options;
4+
5+
public class ColorsDicOption
46
{
5-
public class ColorsDicOption
7+
public void ConfigColorsDic(Dictionary<string, string> replacementsDictionary, bool useHomeLandingPage)
68
{
7-
public void ConfigColorsDic(Dictionary<string, string> replacementsDictionary, bool useHomeLandingPage)
9+
if (useHomeLandingPage)
10+
{
11+
replacementsDictionary.Add("$HeaderCoverLight$", """<x:String x:Key="HeaderCover">/Assets/Cover/CoverLight.png</x:String>""");
12+
replacementsDictionary.Add("$HeaderCoverDark$", """<x:String x:Key="HeaderCover">/Assets/Cover/CoverDark.png</x:String>""");
13+
}
14+
else
815
{
9-
if (useHomeLandingPage)
10-
{
11-
replacementsDictionary.Add("$HeaderCoverLight$", """<x:String x:Key="HeaderCover">/Assets/Cover/CoverLight.png</x:String>""");
12-
replacementsDictionary.Add("$HeaderCoverDark$", """<x:String x:Key="HeaderCover">/Assets/Cover/CoverDark.png</x:String>""");
13-
}
14-
else
15-
{
16-
replacementsDictionary.Add("$HeaderCoverLight$", "");
17-
replacementsDictionary.Add("$HeaderCoverDark$", "");
18-
}
16+
replacementsDictionary.Add("$HeaderCoverLight$", "");
17+
replacementsDictionary.Add("$HeaderCoverDark$", "");
1918
}
2019
}
2120
}

0 commit comments

Comments
 (0)