Skip to content

Commit 09f6421

Browse files
mjcheethammjcheetham
committed
dotnet: drop .NET 4.7.2 for .NET 8
1 parent a0babfc commit 09f6421

File tree

12 files changed

+18
-70
lines changed

12 files changed

+18
-70
lines changed

‎.github/workflows/continuous-integration.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ jobs:
3737
shell: bash
3838
run: |
3939
mkdir -p artifacts/bin
40-
mv out/windows/Installer.Windows/bin/Release/net472/win-x86 artifacts/bin/
41-
cp out/windows/Installer.Windows/bin/Release/net472/win-x86.sym/* artifacts/bin/win-x86/
42-
mv out/windows/Installer.Windows/bin/Release/net472/gcm*.exe artifacts/
40+
mv out/windows/Installer.Windows/bin/Release/net8.0/win-x86 artifacts/bin/
41+
cp out/windows/Installer.Windows/bin/Release/net8.0/win-x86.sym/* artifacts/bin/win-x86/
42+
mv out/windows/Installer.Windows/bin/Release/net8.0/gcm*.exe artifacts/
4343
4444
- name: Upload artifacts
4545
uses: actions/upload-artifact@v3

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ jobs:
200200
/p:PayloadPath=$env:GITHUB_WORKSPACE\payload /p:NoLayout=true `
201201
--configuration=WindowsRelease
202202
mkdir installers
203-
Move-Item -Path .\out\windows\Installer.Windows\bin\Release\net472\*.exe `
203+
Move-Item -Path .\out\windows\Installer.Windows\bin\Release\net8.0\*.exe `
204204
-Destination $env:GITHUB_WORKSPACE\installers
205205
206206
- name: Sign installers with Azure Code Signing

‎Directory.Build.props‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,4 @@
2626
<GenerateWindowsAppManifest Condition="'$(GenerateWindowsAppManifest)' == '' AND '$(OSPlatform)' == 'windows' AND '$(_IsExeProject)' == 'true'">true</GenerateWindowsAppManifest>
2727
</PropertyGroup>
2828

29-
<ItemGroup Condition = "'$(TargetFramework)' == 'net472'">
30-
<PackageReference Include="System.Text.Json">
31-
<Version>7.0.2</Version>
32-
</PackageReference>
33-
</ItemGroup>
34-
3529
</Project>

‎docs/development.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ To build from the command line, run:
4040
dotnet build -c WindowsDebug
4141
```
4242

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

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

4747
### Linux
4848

‎src/shared/Atlassian.Bitbucket/Atlassian.Bitbucket.csproj‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0</TargetFrameworks>
5-
<TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net8.0;net472</TargetFrameworks>
4+
<TargetFramework>net8.0</TargetFramework>
65
<AssemblyName>Atlassian.Bitbucket</AssemblyName>
76
<RootNamespace>Atlassian.Bitbucket</RootNamespace>
87
<IsTestProject>false</IsTestProject>
@@ -13,10 +12,6 @@
1312
<ProjectReference Include="..\Core\Core.csproj" />
1413
</ItemGroup>
1514

16-
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
17-
<Reference Include="System.Net.Http" />
18-
</ItemGroup>
19-
2015
<ItemGroup>
2116
<AvaloniaResource Include="UI\Assets\atlassian-logo.png" />
2217
</ItemGroup>

‎src/shared/Core/Core.csproj‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,21 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0</TargetFrameworks>
5-
<TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net8.0;net472</TargetFrameworks>
4+
<TargetFramework>net8.0</TargetFramework>
65
<AssemblyName>gcmcore</AssemblyName>
76
<RootNamespace>GitCredentialManager</RootNamespace>
87
<IsTestProject>false</IsTestProject>
98
<LangVersion>latest</LangVersion>
109
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1110
</PropertyGroup>
1211

13-
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
14-
<Reference Include="System.Net.Http" />
15-
<Reference Include="System.Web" />
16-
<PackageReference Include="Microsoft.Identity.Client.Broker" Version="4.54.0" />
17-
<PackageReference Include="Avalonia.Win32" Version="11.0.4" />
18-
</ItemGroup>
19-
20-
<ItemGroup Condition="'$(TargetFramework)' != 'net472'">
21-
<PackageReference Include="Avalonia.Desktop" Version="11.0.4" />
22-
</ItemGroup>
23-
2412
<ItemGroup>
2513
<PackageReference Include="Microsoft.Identity.Client" Version="4.54.0" />
14+
<PackageReference Include="Microsoft.Identity.Client.Broker" Version="4.54.0" />
2615
<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="2.28.0" />
2716
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
2817
<PackageReference Include="Avalonia" Version="11.0.4" />
18+
<PackageReference Include="Avalonia.Desktop" Version="11.0.4" />
2919
<PackageReference Include="Avalonia.Skia" Version="11.0.4" />
3020
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.4" />
3121
</ItemGroup>

‎src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net8.0</TargetFrameworks>
6-
<TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net472;net8.0</TargetFrameworks>
5+
<TargetFramework>net8.0</TargetFramework>
76
<RuntimeIdentifiers>win-x86;osx-x64;linux-x64;osx-arm64</RuntimeIdentifiers>
8-
<PlatformTarget Condition="'$(OSPlatform)'=='windows'">x86</PlatformTarget>
97
<AssemblyName>git-credential-manager</AssemblyName>
108
<RootNamespace>GitCredentialManager</RootNamespace>
119
<ApplicationIcon>$(RepoAssetsPath)gcmicon.ico</ApplicationIcon>

‎src/shared/GitHub/GitHub.csproj‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0</TargetFrameworks>
5-
<TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net8.0;net472</TargetFrameworks>
4+
<TargetFramework>net8.0</TargetFramework>
65
<AssemblyName>GitHub</AssemblyName>
76
<RootNamespace>GitHub</RootNamespace>
87
<IsTestProject>false</IsTestProject>
@@ -13,8 +12,4 @@
1312
<ProjectReference Include="..\Core\Core.csproj" />
1413
</ItemGroup>
1514

16-
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
17-
<Reference Include="System.Net.Http" />
18-
</ItemGroup>
19-
2015
</Project>

‎src/shared/GitLab/GitLab.csproj‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0</TargetFrameworks>
5-
<TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net8.0;net472</TargetFrameworks>
4+
<TargetFramework>net8.0</TargetFramework>
65
<AssemblyName>GitLab</AssemblyName>
76
<RootNamespace>GitLab</RootNamespace>
87
<IsTestProject>false</IsTestProject>
@@ -13,8 +12,4 @@
1312
<ProjectReference Include="..\Core\Core.csproj" />
1413
</ItemGroup>
1514

16-
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
17-
<Reference Include="System.Net.Http" />
18-
</ItemGroup>
19-
2015
</Project>

‎src/shared/Microsoft.AzureRepos/Microsoft.AzureRepos.csproj‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0</TargetFrameworks>
5-
<TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net8.0;net472</TargetFrameworks>
4+
<TargetFramework>net8.0</TargetFramework>
65
<AssemblyName>Microsoft.AzureRepos</AssemblyName>
76
<RootNamespace>Microsoft.AzureRepos</RootNamespace>
87
<IsTestProject>false</IsTestProject>
@@ -13,8 +12,4 @@
1312
<ProjectReference Include="..\Core\Core.csproj" />
1413
</ItemGroup>
1514

16-
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
17-
<Reference Include="System.Net.Http" />
18-
</ItemGroup>
19-
2015
</Project>

0 commit comments

Comments
 (0)