diff --git a/.azure-pipelines/templates/windows/pack.yml b/.azure-pipelines/templates/windows/pack.yml index 14f8d2856..9539c27fe 100644 --- a/.azure-pipelines/templates/windows/pack.yml +++ b/.azure-pipelines/templates/windows/pack.yml @@ -6,8 +6,8 @@ steps: displayName: Set version variables - script: | - xcopy "out\windows\Installer.Windows\bin\$(configuration)\net461" "$(Build.StagingDirectory)\publish\" - xcopy "out\windows\Payload.Windows\bin\$(configuration)\net461\win-x86" "$(Build.StagingDirectory)\publish\payload\" + xcopy "out\windows\Installer.Windows\bin\$(configuration)\net472" "$(Build.StagingDirectory)\publish\" + xcopy "out\windows\Payload.Windows\bin\$(configuration)\net472\win-x86" "$(Build.StagingDirectory)\publish\payload\" mkdir "$(Build.StagingDirectory)\publish\payload.sym\" move "$(Build.StagingDirectory)\publish\payload\*.pdb" "$(Build.StagingDirectory)\publish\payload.sym\" displayName: Prepare final build artifacts diff --git a/docs/development.md b/docs/development.md index 6db8a219a..f14023e10 100644 --- a/docs/development.md +++ b/docs/development.md @@ -35,9 +35,9 @@ msbuild /t:restore /p:Configuration=WindowsDebug msbuild /p:Configuration=WindowsDebug ``` -You can find a copy of the installer .exe file in `out\windows\Installer.Windows\bin\Debug\net461`. +You can find a copy of the installer .exe file in `out\windows\Installer.Windows\bin\Debug\net472`. -The flat binaries can also be found in `out\windows\Payload.Windows\bin\Debug\net461\win-x86`. +The flat binaries can also be found in `out\windows\Payload.Windows\bin\Debug\net472\win-x86`. ### Linux diff --git a/src/shared/Atlassian.Bitbucket/Atlassian.Bitbucket.csproj b/src/shared/Atlassian.Bitbucket/Atlassian.Bitbucket.csproj index 9d58c7628..3f4530cff 100644 --- a/src/shared/Atlassian.Bitbucket/Atlassian.Bitbucket.csproj +++ b/src/shared/Atlassian.Bitbucket/Atlassian.Bitbucket.csproj @@ -2,7 +2,7 @@ netstandard2.0 - netstandard2.0;net461 + netstandard2.0;net472 Atlassian.Bitbucket Atlassian.Bitbucket false @@ -13,7 +13,7 @@ - + diff --git a/src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj b/src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj index 5d3df4e8e..2c93e3855 100644 --- a/src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj +++ b/src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj @@ -3,7 +3,7 @@ Exe netcoreapp3.1 - net461;netcoreapp3.1 + net472;netcoreapp3.1 win-x86;osx-x64;linux-x64 x86 git-credential-manager-core diff --git a/src/shared/GitHub/GitHub.csproj b/src/shared/GitHub/GitHub.csproj index 09aa6e57f..7459baae9 100644 --- a/src/shared/GitHub/GitHub.csproj +++ b/src/shared/GitHub/GitHub.csproj @@ -2,7 +2,7 @@ netstandard2.0 - netstandard2.0;net461 + netstandard2.0;net472 GitHub GitHub false @@ -13,7 +13,7 @@ - + diff --git a/src/shared/Microsoft.AzureRepos/Microsoft.AzureRepos.csproj b/src/shared/Microsoft.AzureRepos/Microsoft.AzureRepos.csproj index 2713aa4c4..9587627c3 100644 --- a/src/shared/Microsoft.AzureRepos/Microsoft.AzureRepos.csproj +++ b/src/shared/Microsoft.AzureRepos/Microsoft.AzureRepos.csproj @@ -2,7 +2,7 @@ netstandard2.0 - netstandard2.0;net461 + netstandard2.0;net472 Microsoft.AzureRepos Microsoft.AzureRepos false @@ -13,7 +13,7 @@ - + diff --git a/src/shared/Microsoft.Git.CredentialManager/Microsoft.Git.CredentialManager.csproj b/src/shared/Microsoft.Git.CredentialManager/Microsoft.Git.CredentialManager.csproj index 009d66469..c2e97ab38 100644 --- a/src/shared/Microsoft.Git.CredentialManager/Microsoft.Git.CredentialManager.csproj +++ b/src/shared/Microsoft.Git.CredentialManager/Microsoft.Git.CredentialManager.csproj @@ -2,7 +2,7 @@ netstandard2.0 - netstandard2.0;net461 + netstandard2.0;net472 Microsoft.Git.CredentialManager Microsoft.Git.CredentialManager false @@ -10,7 +10,7 @@ true - + diff --git a/src/windows/Atlassian.Bitbucket.UI.Windows/Atlassian.Bitbucket.UI.Windows.csproj b/src/windows/Atlassian.Bitbucket.UI.Windows/Atlassian.Bitbucket.UI.Windows.csproj index dbdc48e1a..a3c1ea382 100644 --- a/src/windows/Atlassian.Bitbucket.UI.Windows/Atlassian.Bitbucket.UI.Windows.csproj +++ b/src/windows/Atlassian.Bitbucket.UI.Windows/Atlassian.Bitbucket.UI.Windows.csproj @@ -2,7 +2,7 @@ WinExe - net461 + net472 true Atlassian.Bitbucket.UI Atlassian.Bitbucket.UI diff --git a/src/windows/GitHub.UI.Windows/GitHub.UI.Windows.csproj b/src/windows/GitHub.UI.Windows/GitHub.UI.Windows.csproj index 572e0b8ed..269d30a44 100644 --- a/src/windows/GitHub.UI.Windows/GitHub.UI.Windows.csproj +++ b/src/windows/GitHub.UI.Windows/GitHub.UI.Windows.csproj @@ -2,7 +2,7 @@ WinExe - net461 + net472 true GitHub.UI GitHub.UI diff --git a/src/windows/Installer.Windows/Installer.Windows.csproj b/src/windows/Installer.Windows/Installer.Windows.csproj index fe95782d7..087aeeb78 100644 --- a/src/windows/Installer.Windows/Installer.Windows.csproj +++ b/src/windows/Installer.Windows/Installer.Windows.csproj @@ -3,9 +3,9 @@ - net461 + net472 false - $(PlatformOutPath)Payload.Windows\bin\$(Configuration)\net461\win-x86 + $(PlatformOutPath)Payload.Windows\bin\$(Configuration)\net472\win-x86 false diff --git a/src/windows/Installer.Windows/Setup.iss b/src/windows/Installer.Windows/Setup.iss index f416df8c0..36484e0df 100644 --- a/src/windows/Installer.Windows/Setup.iss +++ b/src/windows/Installer.Windows/Setup.iss @@ -115,6 +115,11 @@ Source: "{#PayloadDir}\Microsoft.Git.CredentialManager.UI.dll"; DestDir: Source: "{#PayloadDir}\Microsoft.Identity.Client.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "{#PayloadDir}\Microsoft.Identity.Client.Extensions.Msal.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "{#PayloadDir}\Newtonsoft.Json.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "{#PayloadDir}\System.Buffers.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "{#PayloadDir}\System.CommandLine.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "{#PayloadDir}\System.Memory.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "{#PayloadDir}\System.Numerics.Vectors.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "{#PayloadDir}\System.Runtime.CompilerServices.Unsafe.dll"; DestDir: "{app}"; Flags: ignoreversion [Code] // Don't allow installing conflicting architectures diff --git a/src/windows/Payload.Windows/Payload.Windows.csproj b/src/windows/Payload.Windows/Payload.Windows.csproj index 5cecd717c..8a57828af 100644 --- a/src/windows/Payload.Windows/Payload.Windows.csproj +++ b/src/windows/Payload.Windows/Payload.Windows.csproj @@ -3,7 +3,7 @@ - net461 + net472 win-x86 false diff --git a/src/windows/Shared.UI.Windows/Shared.UI.Windows.csproj b/src/windows/Shared.UI.Windows/Shared.UI.Windows.csproj index 7da43b5c3..86462cb6f 100644 --- a/src/windows/Shared.UI.Windows/Shared.UI.Windows.csproj +++ b/src/windows/Shared.UI.Windows/Shared.UI.Windows.csproj @@ -1,7 +1,7 @@  - net461 + net472 true Microsoft.Git.CredentialManager.UI Microsoft.Git.CredentialManager.UI