Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix duplicate class ids #3535

Merged
merged 2 commits into from
Aug 5, 2024
Merged

Fix duplicate class ids #3535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bd946a
fix class ids
ssparach Aug 2, 2024
ac8be19
remaining modifications for ClassId change
ssparach Aug 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions common/Helpers/CommonConstants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,26 @@ public static class CommonConstants
public const string HyperVExtensionClassId = "6B219EF0-E238-434C-952E-4DF3D452AC83";

public const string WSLExtensionClassId = "EF2342AC-FF53-433D-9EDE-D395500F3B3E";

public const string GitExtensionClassId = "A65E46FF-F979-480d-A379-1FDA3EB5F7C5";

public const string SourceControlServerClassId = "8DDE51FC-3AE8-4880-BD85-CA57DF7E2889";
#elif STABLE_BUILD
public const string HyperVExtensionClassId = "F8B26528-976A-488C-9B40-7198FB425C9E";

public const string WSLExtensionClassId = "121253AB-BA5D-4E73-99CF-25A2CB8BF173";

public const string GitExtensionClassId = "8A962CBD-530D-4195-8FE3-F0DF3FDDF128";

public const string SourceControlServerClassId = "1212F95B-257E-414e-B44F-F26634BD2627";
#else
public const string HyperVExtensionClassId = "28DD4098-162D-483C-9ED0-FB3887A22F61";

public const string WSLExtensionClassId = "7F572DC5-F40E-440F-B660-F579168B69B8";

public const string GitExtensionClassId = "BDA76685-E749-4f09-8F13-C466D0802DA1";

public const string SourceControlServerClassId = "40FE4D6E-C9A0-48b4-A83E-AAA1D002C0D5";
#endif

public const string HyperVWindowsOptionalFeatureName = "Microsoft-Hyper-V";
Expand Down
2 changes: 1 addition & 1 deletion src/Package-Can.appxmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
<com:Extension Category="windows.comServer">
<com:ComServer>
<com:ExeServer Executable="DevHome.FileExplorerSourceControlIntegration.exe" Arguments="-RegisterProcessAsComServer" DisplayName="Source Control Core">
<com:Class Id="40FE4D6E-C9A0-48b4-A83E-AAA1D002C0D5" DisplayName="Core Extension" />
<com:Class Id="8DDE51FC-3AE8-4880-BD85-CA57DF7E2889" DisplayName="Core Extension" />
</com:ExeServer>
</com:ComServer>
</com:Extension>
Expand Down
2 changes: 1 addition & 1 deletion src/Package.appxmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
<com:Extension Category="windows.comServer">
<com:ComServer>
<com:ExeServer Executable="DevHome.FileExplorerSourceControlIntegration.exe" Arguments="-RegisterProcessAsComServer" DisplayName="Source Control Core">
<com:Class Id="40FE4D6E-C9A0-48b4-A83E-AAA1D002C0D5" DisplayName="Core Extension" />
<com:Class Id="1212F95B-257E-414e-B44F-F26634BD2627" DisplayName="Core Extension" />
</com:ExeServer>
</com:ComServer>
</com:Extension>
Expand Down
6 changes: 6 additions & 0 deletions tools/Customization/DevHome.FileExplorerSourceControlIntegration/SourceControlProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,13 @@ namespace FileExplorerSourceControlIntegration;

#nullable enable
[ComVisible(true)]
#if CANARY_BUILD
[Guid("8DDE51FC-3AE8-4880-BD85-CA57DF7E2889")]
#elif STABLE_BUILD
[Guid("1212F95B-257E-414e-B44F-F26634BD2627")]
#else
[Guid("40FE4D6E-C9A0-48B4-A83E-AAA1D002C0D5")]
#endif
public class SourceControlProvider :
Microsoft.Internal.Windows.DevHome.Helpers.FileExplorer.IExtraFolderPropertiesHandler,
Microsoft.Internal.Windows.DevHome.Helpers.FileExplorer.IPerFolderRootSelector
Expand Down
Loading