Remove Microsoft from assembly names

ldennington · ldennington · commit 8b96141207e3 · 2021-11-01T08:47:54.000-07:00
This change updates the following assembly names:

Microsoft.Git.CredentialManager --&gt; gcmcore
Microsoft.Git.CredentialManager.UI --&gt; gcmcoreui
Microsoft.Git.CredentialManager.UI.Avalonia --&gt; gcmcoreuiavn
Shared.UI.Windows --&gt; gcmcoreuiwpf

It also updates the corresponding xaml/iss files with the new names.
diff --git a/src/osx/SignFiles.Mac/SignFiles.Mac.csproj b/src/osx/SignFiles.Mac/SignFiles.Mac.csproj
@@ -28,7 +28,7 @@
       $(OutDir)\GitHub.UI.dll;
       $(OutDir)\GitHub.UI.Shared.dll;
       $(OutDir)\Microsoft.AzureRepos.dll;
-      $(OutDir)\Microsoft.Git.CredentialManager.dll;">
+      $(OutDir)\gcmcore.dll;">
       <Authenticode>Microsoft400</Authenticode>
       <InProject>false</InProject>
     </FilesToSign>
diff --git a/src/shared/GitHub.UI.Avalonia/Views/CredentialsView.axaml b/src/shared/GitHub.UI.Avalonia/Views/CredentialsView.axaml
@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:controls="clr-namespace:GitHub.UI.Controls"
              xmlns:vm="clr-namespace:GitHub.UI.ViewModels;assembly=GitHub.UI.Shared"
-             xmlns:converters="clr-namespace:Microsoft.Git.CredentialManager.UI.Converters;assembly=Microsoft.Git.CredentialManager.UI.Avalonia"
+             xmlns:converters="clr-namespace:Microsoft.Git.CredentialManager.UI.Converters;assembly=gcmcoreuiavn"
              mc:Ignorable="d" d:DesignWidth="420"
              x:Class="GitHub.UI.Views.CredentialsView">
     <Design.DataContext>
diff --git a/src/shared/Microsoft.Git.CredentialManager.UI.Avalonia/Assets/Controls.axaml b/src/shared/Microsoft.Git.CredentialManager.UI.Avalonia/Assets/Controls.axaml
@@ -1,6 +1,6 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <StyleInclude Source="avares://Microsoft.Git.CredentialManager.UI.Avalonia/Assets/ButtonHyperlink.axaml"/>
+    <StyleInclude Source="avares://gcmcoreuiavn/Assets/ButtonHyperlink.axaml"/>
     <Style Selector="TextBox.monospace">
         <Setter Property="FontFamily" Value="SF Mono, Courier New, Courier, monospace" />
     </Style>
diff --git a/src/shared/Microsoft.Git.CredentialManager.UI.Avalonia/AvaloniaApp.axaml b/src/shared/Microsoft.Git.CredentialManager.UI.Avalonia/AvaloniaApp.axaml
@@ -4,12 +4,12 @@
              Name="Git Credential Manager">
     <Application.Styles>
         <FluentTheme Mode="Light"/>
-        <StyleInclude Source="avares://Microsoft.Git.CredentialManager.UI.Avalonia/Assets/Controls.axaml"/>
+        <StyleInclude Source="avares://gcmcoreuiavn/Assets/Controls.axaml"/>
     </Application.Styles>
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="avares://Microsoft.Git.CredentialManager.UI.Avalonia/Assets/LightBase.axaml"/>
+                <ResourceInclude Source="avares://gcmcoreuiavn/Assets/LightBase.axaml"/>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/src/shared/Microsoft.Git.CredentialManager.UI.Avalonia/Controls/AboutWindow.axaml b/src/shared/Microsoft.Git.CredentialManager.UI.Avalonia/Controls/AboutWindow.axaml
@@ -10,12 +10,12 @@
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="avares://Microsoft.Git.CredentialManager.UI.Avalonia/Assets/Images.axaml"/>
+                <ResourceInclude Source="gcmcoreuiavn/Assets/Images.axaml"/>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Window.Resources>
     <Window.Styles>
-        <StyleInclude Source="avares://Microsoft.Git.CredentialManager.UI.Avalonia/Assets/Controls.axaml"/>
+        <StyleInclude Source="avares://gcmcoreuiavn/Assets/Controls.axaml"/>
     </Window.Styles>
     <StackPanel Margin="20">
         <Image HorizontalAlignment="Center"
diff --git a/src/shared/Microsoft.Git.CredentialManager.UI.Avalonia/Controls/DialogWindow.axaml b/src/shared/Microsoft.Git.CredentialManager.UI.Avalonia/Controls/DialogWindow.axaml
@@ -2,7 +2,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:vm="clr-namespace:Microsoft.Git.CredentialManager.UI.ViewModels;assembly=Microsoft.Git.CredentialManager.UI"
+        xmlns:vm="clr-namespace:Microsoft.Git.CredentialManager.UI.ViewModels;assembly=gcmcoreui"
         xmlns:converters="clr-namespace:Microsoft.Git.CredentialManager.UI.Converters"
         mc:Ignorable="d" d:DesignWidth="420" d:DesignHeight="520"
         x:Class="Microsoft.Git.CredentialManager.UI.Controls.DialogWindow"
diff --git a/src/shared/Microsoft.Git.CredentialManager.UI.Avalonia/Microsoft.Git.CredentialManager.UI.Avalonia.csproj b/src/shared/Microsoft.Git.CredentialManager.UI.Avalonia/Microsoft.Git.CredentialManager.UI.Avalonia.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
+    <AssemblyName>gcmcoreuiavn</AssemblyName>
     <RootNamespace>Microsoft.Git.CredentialManager.UI</RootNamespace>
   </PropertyGroup>
 
diff --git a/src/shared/Microsoft.Git.CredentialManager.UI/Microsoft.Git.CredentialManager.UI.csproj b/src/shared/Microsoft.Git.CredentialManager.UI/Microsoft.Git.CredentialManager.UI.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <AssemblyName>gcmcoreui</AssemblyName>
     <RootNamespace>Microsoft.Git.CredentialManager.UI</RootNamespace>
   </PropertyGroup>
 
diff --git a/src/shared/Microsoft.Git.CredentialManager/Microsoft.Git.CredentialManager.csproj b/src/shared/Microsoft.Git.CredentialManager/Microsoft.Git.CredentialManager.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(OSPlatform)'=='windows'">netstandard2.0;net472</TargetFrameworks>
-    <AssemblyName>Microsoft.Git.CredentialManager</AssemblyName>
+    <AssemblyName>gcmcore</AssemblyName>
     <RootNamespace>Microsoft.Git.CredentialManager</RootNamespace>
     <IsTestProject>false</IsTestProject>
     <LangVersion>latest</LangVersion>
diff --git a/src/windows/Atlassian.Bitbucket.UI.Windows/Assets/Styles.xaml b/src/windows/Atlassian.Bitbucket.UI.Windows/Assets/Styles.xaml
@@ -1,6 +1,6 @@
 ﻿<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/Microsoft.Git.CredentialManager.UI.Windows;component/Assets/Styles.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/gcmcoreuiwpf;component/Assets/Styles.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
diff --git a/src/windows/Atlassian.Bitbucket.UI.Windows/Views/CredentialsView.xaml b/src/windows/Atlassian.Bitbucket.UI.Windows/Views/CredentialsView.xaml
@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:viewModels="clr-namespace:Atlassian.Bitbucket.UI.ViewModels;assembly=Atlassian.Bitbucket.UI.Shared"
-             xmlns:sharedControls="clr-namespace:Microsoft.Git.CredentialManager.UI.Controls;assembly=Microsoft.Git.CredentialManager.UI.Windows"
+             xmlns:sharedControls="clr-namespace:Microsoft.Git.CredentialManager.UI.Controls;assembly=gcmcoreuiwpf"
              mc:Ignorable="d"
              d:DataContext="{d:DesignInstance viewModels:CredentialsViewModel}"
              d:DesignWidth="300">
diff --git a/src/windows/GitHub.UI.Windows/Assets/Styles.xaml b/src/windows/GitHub.UI.Windows/Assets/Styles.xaml
@@ -1,6 +1,6 @@
 ﻿<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/Microsoft.Git.CredentialManager.UI.Windows;component/Assets/Styles.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/gcmcoreuiwpf;component/Assets/Styles.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
diff --git a/src/windows/GitHub.UI.Windows/Views/CredentialsView.xaml b/src/windows/GitHub.UI.Windows/Views/CredentialsView.xaml
@@ -4,9 +4,9 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:viewModels="clr-namespace:GitHub.UI.ViewModels;assembly=GitHub.UI.Shared"
-             xmlns:converters="clr-namespace:Microsoft.Git.CredentialManager.UI.Converters;assembly=Microsoft.Git.CredentialManager.UI.Windows"
+             xmlns:converters="clr-namespace:Microsoft.Git.CredentialManager.UI.Converters;assembly=gcmcoreuiwpf"
              xmlns:controls="clr-namespace:GitHub.UI.Controls"
-             xmlns:sharedControls="clr-namespace:Microsoft.Git.CredentialManager.UI.Controls;assembly=Microsoft.Git.CredentialManager.UI.Windows"
+             xmlns:sharedControls="clr-namespace:Microsoft.Git.CredentialManager.UI.Controls;assembly=gcmcoreuiwpf"
              mc:Ignorable="d"
              d:DataContext="{d:DesignInstance viewModels:CredentialsViewModel}"
              d:DesignWidth="300">
diff --git a/src/windows/Installer.Windows/Setup.iss b/src/windows/Installer.Windows/Setup.iss
@@ -113,9 +113,9 @@ Source: "{#PayloadDir}\GitHub.UI.exe";                                  DestDir:
 Source: "{#PayloadDir}\GitHub.UI.exe.config";                           DestDir: "{app}"; Flags: ignoreversion
 Source: "{#PayloadDir}\GitHub.UI.Shared.dll";                           DestDir: "{app}"; Flags: ignoreversion
 Source: "{#PayloadDir}\Microsoft.AzureRepos.dll";                       DestDir: "{app}"; Flags: ignoreversion
-Source: "{#PayloadDir}\Microsoft.Git.CredentialManager.dll";            DestDir: "{app}"; Flags: ignoreversion
-Source: "{#PayloadDir}\Microsoft.Git.CredentialManager.UI.dll";         DestDir: "{app}"; Flags: ignoreversion
-Source: "{#PayloadDir}\Microsoft.Git.CredentialManager.UI.Windows.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#PayloadDir}\gcmcore.dll";                                    DestDir: "{app}"; Flags: ignoreversion
+Source: "{#PayloadDir}\gcmcoreui.dll";                                  DestDir: "{app}"; Flags: ignoreversion
+Source: "{#PayloadDir}\gcmcoreuiwpf.dll";                               DestDir: "{app}"; Flags: ignoreversion
 Source: "{#PayloadDir}\Microsoft.Identity.Client.Desktop.dll";          DestDir: "{app}"; Flags: ignoreversion
 Source: "{#PayloadDir}\Microsoft.Identity.Client.dll";                  DestDir: "{app}"; Flags: ignoreversion
 Source: "{#PayloadDir}\Microsoft.Identity.Client.Extensions.Msal.dll";  DestDir: "{app}"; Flags: ignoreversion
diff --git a/src/windows/Payload.Windows/Payload.Windows.csproj b/src/windows/Payload.Windows/Payload.Windows.csproj
@@ -28,8 +28,8 @@
       $(OutDir)GitHub.dll;
       $(OutDir)GitHub.UI.exe;
       $(OutDir)Microsoft.AzureRepos.dll;
-      $(OutDir)Microsoft.Git.CredentialManager.dll;
-      $(OutDir)Microsoft.Git.CredentialManager.UI.dll;">
+      $(OutDir)gcmcore.dll;
+      $(OutDir)gcmcoreuiwpf.dll;">
       <Authenticode>Microsoft400</Authenticode>
       <InProject>false</InProject>
     </FilesToSign>
diff --git a/src/windows/Shared.UI.Windows/Controls/DialogWindow.xaml b/src/windows/Shared.UI.Windows/Controls/DialogWindow.xaml
@@ -3,7 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"
-        xmlns:viewModels="clr-namespace:Microsoft.Git.CredentialManager.UI.ViewModels;assembly=Microsoft.Git.CredentialManager.UI"
+        xmlns:viewModels="clr-namespace:Microsoft.Git.CredentialManager.UI.ViewModels;assembly=gcmcoreui"
         Width="414"
         SizeToContent="Height"
         MinHeight="320"
diff --git a/src/windows/Shared.UI.Windows/Shared.UI.Windows.csproj b/src/windows/Shared.UI.Windows/Shared.UI.Windows.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net472</TargetFramework>
     <UseWPF>true</UseWPF>
     <RootNamespace>Microsoft.Git.CredentialManager.UI</RootNamespace>
-    <AssemblyName>Microsoft.Git.CredentialManager.UI.Windows</AssemblyName>
+    <AssemblyName>gcmcoreuiwpf</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
