Skip to content

Commit 307e936

Browse files
mjcheethammjcheetham
authored
Merge pull request #283 from mjcheetham/net472
Target .NET Framework 4.7.2 and fix missing binaries in Windows installers
2 parents 5f8b6b4 + 862db15 commit 307e936

File tree

13 files changed

+24
-19
lines changed

13 files changed

+24
-19
lines changed

‎.azure-pipelines/templates/windows/pack.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ steps:
66
displayName: Set version variables
77

88
- script: |
9-
xcopy "out\windows\Installer.Windows\bin\$(configuration)\net461" "$(Build.StagingDirectory)\publish\"
10-
xcopy "out\windows\Payload.Windows\bin\$(configuration)\net461\win-x86" "$(Build.StagingDirectory)\publish\payload\"
9+
xcopy "out\windows\Installer.Windows\bin\$(configuration)\net472" "$(Build.StagingDirectory)\publish\"
10+
xcopy "out\windows\Payload.Windows\bin\$(configuration)\net472\win-x86" "$(Build.StagingDirectory)\publish\payload\"
1111
mkdir "$(Build.StagingDirectory)\publish\payload.sym\"
1212
move "$(Build.StagingDirectory)\publish\payload\*.pdb" "$(Build.StagingDirectory)\publish\payload.sym\"
1313
displayName: Prepare final build artifacts

‎docs/development.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ msbuild /t:restore /p:Configuration=WindowsDebug
3535
msbuild /p:Configuration=WindowsDebug
3636
```
3737

38-
You can find a copy of the installer .exe file in `out\windows\Installer.Windows\bin\Debug\net461`.
38+
You can find a copy of the installer .exe file in `out\windows\Installer.Windows\bin\Debug\net472`.
3939

40-
The flat binaries can also be found in `out\windows\Payload.Windows\bin\Debug\net461\win-x86`.
40+
The flat binaries can also be found in `out\windows\Payload.Windows\bin\Debug\net472\win-x86`.
4141

4242
### Linux
4343

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0</TargetFrameworks>
5-
<TargetFrameworks Condition="'$(OSPlatform)'=='windows'">netstandard2.0;net461</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(OSPlatform)'=='windows'">netstandard2.0;net472</TargetFrameworks>
66
<AssemblyName>Atlassian.Bitbucket</AssemblyName>
77
<RootNamespace>Atlassian.Bitbucket</RootNamespace>
88
<IsTestProject>false</IsTestProject>
@@ -13,7 +13,7 @@
1313
<ProjectReference Include="..\Microsoft.Git.CredentialManager\Microsoft.Git.CredentialManager.csproj" />
1414
</ItemGroup>
1515

16-
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
16+
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
1717
<Reference Include="System.Net.Http" />
1818
</ItemGroup>
1919

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
6-
<TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net461;netcoreapp3.1</TargetFrameworks>
6+
<TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net472;netcoreapp3.1</TargetFrameworks>
77
<RuntimeIdentifiers>win-x86;osx-x64;linux-x64</RuntimeIdentifiers>
88
<PlatformTarget Condition="'$(OSPlatform)'=='windows'">x86</PlatformTarget>
99
<AssemblyName>git-credential-manager-core</AssemblyName>

‎src/shared/GitHub/GitHub.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0</TargetFrameworks>
5-
<TargetFrameworks Condition="'$(OSPlatform)'=='windows'">netstandard2.0;net461</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(OSPlatform)'=='windows'">netstandard2.0;net472</TargetFrameworks>
66
<AssemblyName>GitHub</AssemblyName>
77
<RootNamespace>GitHub</RootNamespace>
88
<IsTestProject>false</IsTestProject>
@@ -13,7 +13,7 @@
1313
<ProjectReference Include="..\Microsoft.Git.CredentialManager\Microsoft.Git.CredentialManager.csproj" />
1414
</ItemGroup>
1515

16-
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
16+
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
1717
<Reference Include="System.Net.Http" />
1818
</ItemGroup>
1919

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0</TargetFrameworks>
5-
<TargetFrameworks Condition="'$(OSPlatform)'=='windows'">netstandard2.0;net461</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(OSPlatform)'=='windows'">netstandard2.0;net472</TargetFrameworks>
66
<AssemblyName>Microsoft.AzureRepos</AssemblyName>
77
<RootNamespace>Microsoft.AzureRepos</RootNamespace>
88
<IsTestProject>false</IsTestProject>
@@ -13,7 +13,7 @@
1313
<ProjectReference Include="..\Microsoft.Git.CredentialManager\Microsoft.Git.CredentialManager.csproj" />
1414
</ItemGroup>
1515

16-
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
16+
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
1717
<Reference Include="System.Net.Http" />
1818
</ItemGroup>
1919

‎src/shared/Microsoft.Git.CredentialManager/Microsoft.Git.CredentialManager.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0</TargetFrameworks>
5-
<TargetFrameworks Condition="'$(OSPlatform)'=='windows'">netstandard2.0;net461</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(OSPlatform)'=='windows'">netstandard2.0;net472</TargetFrameworks>
66
<AssemblyName>Microsoft.Git.CredentialManager</AssemblyName>
77
<RootNamespace>Microsoft.Git.CredentialManager</RootNamespace>
88
<IsTestProject>false</IsTestProject>
99
<LangVersion>latest</LangVersion>
1010
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1111
</PropertyGroup>
1212

13-
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
13+
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
1414
<Reference Include="System.Net.Http" />
1515
<Reference Include="System.Web" />
1616
</ItemGroup>

‎src/windows/Atlassian.Bitbucket.UI.Windows/Atlassian.Bitbucket.UI.Windows.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net461</TargetFramework>
5+
<TargetFramework>net472</TargetFramework>
66
<UseWPF>true</UseWPF>
77
<RootNamespace>Atlassian.Bitbucket.UI</RootNamespace>
88
<AssemblyName>Atlassian.Bitbucket.UI</AssemblyName>

‎src/windows/GitHub.UI.Windows/GitHub.UI.Windows.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net461</TargetFramework>
5+
<TargetFramework>net472</TargetFramework>
66
<UseWPF>true</UseWPF>
77
<RootNamespace>GitHub.UI</RootNamespace>
88
<AssemblyName>GitHub.UI</AssemblyName>

‎src/windows/Installer.Windows/Installer.Windows.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
44

55
<PropertyGroup>
6-
<TargetFramework>net461</TargetFramework>
6+
<TargetFramework>net472</TargetFramework>
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
8-
<PayloadPath>$(PlatformOutPath)Payload.Windows\bin\$(Configuration)\net461\win-x86</PayloadPath>
8+
<PayloadPath>$(PlatformOutPath)Payload.Windows\bin\$(Configuration)\net472\win-x86</PayloadPath>
99
<EnableDefaultItems>false</EnableDefaultItems>
1010
</PropertyGroup>
1111

0 commit comments

Comments
 (0)