Skip to content

fix ambiguous call to string.Split #2285

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

Closed
agollivermsft wants to merge 2 commits into from
Closed

fix ambiguous call to string.Split #2285

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
2451727
update to dotnet 8.0 everywhere?
agollivermsft Mar 10, 2026
4df2a9b
fix ambiguous call
agollivermsft Mar 10, 2026
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
6 changes: 3 additions & 3 deletions .github/workflows/continuous-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ jobs:
shell: bash
run: |
mkdir -p artifacts/bin
mv out/windows/Installer.Windows/bin/Release/net472/gcm*.exe artifacts/
mv out/windows/Installer.Windows/bin/Release/net472/${{ matrix.runtime }} artifacts/bin/
cp out/windows/Installer.Windows/bin/Release/net472/${{ matrix.runtime }}.sym/* artifacts/bin/${{ matrix.runtime }}/
mv out/windows/Installer.Windows/bin/Release/net8.0/gcm*.exe artifacts/
mv out/windows/Installer.Windows/bin/Release/net8.0/${{ matrix.runtime }} artifacts/bin/
cp out/windows/Installer.Windows/bin/Release/net8.0/${{ matrix.runtime }}.sym/* artifacts/bin/${{ matrix.runtime }}/

- name: Upload artifacts
uses: actions/upload-artifact@v7
Expand Down
6 changes: 0 additions & 6 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,4 @@
<GenerateWindowsAppManifest Condition="'$(GenerateWindowsAppManifest)' == '' AND '$(OSPlatform)' == 'windows' AND '$(_IsExeProject)' == 'true'">true</GenerateWindowsAppManifest>
</PropertyGroup>

<ItemGroup Condition = "'$(TargetFramework)' == 'net472'">
<PackageReference Include="System.Text.Json">
<Version>8.0.5</Version>
</PackageReference>
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions docs/development.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ To build from the command line, run:
dotnet build -c WindowsDebug
```

You can find a copy of the installer .exe file in `out\windows\Installer.Windows\bin\Debug\net472`.
You can find a copy of the installer .exe file in `out\windows\Installer.Windows\bin\Debug\net8.0`.

The flat binaries can also be found in `out\windows\Payload.Windows\bin\Debug\net472\win-x86`.
The flat binaries can also be found in `out\windows\Payload.Windows\bin\Debug\net8.0\win-x86`.

### Linux

Expand Down
5 changes: 0 additions & 5 deletions src/shared/Atlassian.Bitbucket/Atlassian.Bitbucket.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net8.0;net472</TargetFrameworks>
<AssemblyName>Atlassian.Bitbucket</AssemblyName>
<RootNamespace>Atlassian.Bitbucket</RootNamespace>
<IsTestProject>false</IsTestProject>
Expand All @@ -13,10 +12,6 @@
<ProjectReference Include="..\Core\Core.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
<Reference Include="System.Net.Http" />
</ItemGroup>

<ItemGroup>
<AvaloniaResource Include="UI\Assets\atlassian-logo.png" />
</ItemGroup>
Expand Down
13 changes: 1 addition & 12 deletions src/shared/Core/Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,19 @@

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net8.0;net472</TargetFrameworks>
<AssemblyName>gcmcore</AssemblyName>
<RootNamespace>GitCredentialManager</RootNamespace>
<IsTestProject>false</IsTestProject>
<LangVersion>latest</LangVersion>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
<Reference Include="System.Net.Http" />
<Reference Include="System.Web" />
<PackageReference Include="Microsoft.Identity.Client.Broker" Version="4.65.0" />
<PackageReference Include="Avalonia.Win32" Version="11.1.3" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' != 'net472'">
<PackageReference Include="Avalonia.Desktop" Version="11.1.3" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Identity.Client" Version="4.65.0" />
<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.65.0" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
<PackageReference Include="Avalonia" Version="11.1.3" />
<PackageReference Include="Avalonia.Desktop" Version="11.1.3" />
<PackageReference Include="Avalonia.Skia" Version="11.1.3" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.3" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/shared/Core/Interop/Linux/LinuxConfigParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public IDictionary<string, string> Parse(string content)
{
var result = new Dictionary<string, string>(GitConfigurationKeyComparer.Instance);

IEnumerable<string> lines = content.Split(['\n'], StringSplitOptions.RemoveEmptyEntries);
IEnumerable<string> lines = content.Split("\n", StringSplitOptions.RemoveEmptyEntries);

foreach (string line in lines)
{
Expand Down
1 change: 0 additions & 1 deletion src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net472;net8.0</TargetFrameworks>
<RuntimeIdentifiers>win-x86;win-x64;win-arm64;osx-x64;linux-x64;osx-arm64;linux-arm64;linux-arm</RuntimeIdentifiers>
<AssemblyName>git-credential-manager</AssemblyName>
<RootNamespace>GitCredentialManager</RootNamespace>
Expand Down
5 changes: 0 additions & 5 deletions src/shared/GitHub/GitHub.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net8.0;net472</TargetFrameworks>
<AssemblyName>GitHub</AssemblyName>
<RootNamespace>GitHub</RootNamespace>
<IsTestProject>false</IsTestProject>
Expand All @@ -13,8 +12,4 @@
<ProjectReference Include="..\Core\Core.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
<Reference Include="System.Net.Http" />
</ItemGroup>

</Project>
5 changes: 0 additions & 5 deletions src/shared/GitLab/GitLab.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net8.0;net472</TargetFrameworks>
<AssemblyName>GitLab</AssemblyName>
<RootNamespace>GitLab</RootNamespace>
<IsTestProject>false</IsTestProject>
Expand All @@ -13,8 +12,4 @@
<ProjectReference Include="..\Core\Core.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
<Reference Include="System.Net.Http" />
</ItemGroup>

</Project>
5 changes: 0 additions & 5 deletions src/shared/Microsoft.AzureRepos/Microsoft.AzureRepos.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net8.0;net472</TargetFrameworks>
<AssemblyName>Microsoft.AzureRepos</AssemblyName>
<RootNamespace>Microsoft.AzureRepos</RootNamespace>
<IsTestProject>false</IsTestProject>
Expand All @@ -13,8 +12,4 @@
<ProjectReference Include="..\Core\Core.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
<Reference Include="System.Net.Http" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions src/windows/Installer.Windows/Installer.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
</PropertyGroup>

<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<EnableDefaultItems>false</EnableDefaultItems>
<PayloadPath>$(PlatformOutPath)Installer.Windows\bin\$(Configuration)\net472\$(RuntimeIdentifier)\</PayloadPath>
<PayloadPath>$(PlatformOutPath)Installer.Windows\bin\$(Configuration)\net8.0\$(RuntimeIdentifier)\</PayloadPath>
<InnoSetupVersion>6.3.1</InnoSetupVersion>
<!-- We already append the RID to our intermediate PayloadPath and also to the
final installer filenames so there's no need to append to the output path. -->
Expand Down
2 changes: 1 addition & 1 deletion src/windows/Installer.Windows/layout.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ mkdir -p "$PAYLOAD","$SYMBOLS" | Out-Null
# Publish core application executables
Write-Output "Publishing core application..."
dotnet publish "$GCM_SRC" `
--framework net472 `
--framework net8.0 `
--configuration "$Configuration" `
--runtime $RuntimeIdentifier `
--output "$PAYLOAD"
Expand Down
Loading