Skip to content

Commit 98bde60

Browse files
mjcheethammjcheetham
committed
netcore: upgrade to .NET Core 3.1
Upgrade our .NET Core components from 2.1 to 3.1 (LTS).
1 parent 7283e81 commit 98bde60

File tree

14 files changed

+61
-87
lines changed

14 files changed

+61
-87
lines changed

‎.azure-pipelines/templates/osx/compile.yml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
steps:
2-
- task: DotNetCoreInstaller@0
3-
displayName: Install .NET Core SDK 3.1.201
4-
inputs:
5-
packageType: sdk
6-
version: '3.1.201'
2+
- task: UseDotNet@2
3+
displayName: Use .NET Core SDK 3.1.x
4+
inputs:
5+
packageType: sdk
6+
version: 3.1.x
77

8-
- task: DotNetCoreCLI@2
9-
displayName: Compile common code and macOS Helpers
10-
inputs:
11-
command: build
12-
projects: 'Git-Credential-Manager.sln'
13-
arguments: '--configuration=Mac$(configuration)'
8+
- task: DotNetCoreCLI@2
9+
displayName: Compile common code and macOS Helpers
10+
inputs:
11+
command: build
12+
projects: 'Git-Credential-Manager.sln'
13+
arguments: '--configuration=Mac$(configuration)'
1414

15-
- task: DotNetCoreCLI@2
16-
displayName: Run common unit tests
17-
inputs:
18-
command: test
19-
projects: 'Git-Credential-Manager.sln'
20-
arguments: '--configuration=Mac$(configuration)'
21-
publishTestResults: true
22-
testRunTitle: 'Unit tests - common (macOS)'
15+
- task: DotNetCoreCLI@2
16+
displayName: Run common unit tests
17+
inputs:
18+
command: test
19+
projects: 'Git-Credential-Manager.sln'
20+
arguments: '--configuration=Mac$(configuration)'
21+
publishTestResults: true
22+
testRunTitle: 'Unit tests (macOS)'

‎.azure-pipelines/templates/osx/pack.signed/step3-pack.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ steps:
66
artifactName: 'tmp.macpayload_signed'
77
downloadPath: '$(Build.StagingDirectory)/payload'
88

9-
- task: DotNetCoreInstaller@0
10-
displayName: Install .NET Core SDK 3.1.201
9+
- task: UseDotNet@2
10+
displayName: Use .NET Core SDK 3.1.x
1111
inputs:
1212
packageType: sdk
13-
version: '3.1.201'
13+
version: 3.1.x
1414

1515
- script: dotnet tool install --global nbgv
1616
displayName: Install Nerdbank.GitVersioning tool

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

Lines changed: 24 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,29 @@
11
steps:
2-
- task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@2
3-
displayName: Install signing plugin
4-
condition: and(succeeded(), eq(variables['SignType'], 'real'))
5-
inputs:
6-
signType: '$(SignType)'
2+
- task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@2
3+
displayName: Install signing plugin
4+
condition: and(succeeded(), eq(variables['SignType'], 'real'))
5+
inputs:
6+
signType: '$(SignType)'
77

8-
- task: DotNetCoreInstaller@0
9-
displayName: Install .NET Core SDK 3.1.201
10-
inputs:
11-
packageType: sdk
12-
version: '3.1.201'
8+
- task: UseDotNet@2
9+
displayName: Use .NET Core SDK 3.1.x
10+
inputs:
11+
packageType: sdk
12+
version: 3.1.x
1313

14-
- task: NuGetToolInstaller@0
15-
displayName: Install NuGet tool >=4.3.0
16-
inputs:
17-
versionSpec: '>=4.3.0'
14+
- task: DotNetCoreCLI@2
15+
displayName: Compile common code and Windows Helpers
16+
inputs:
17+
command: build
18+
projects: 'Git-Credential-Manager.sln'
19+
arguments: '--configuration=Windows$(configuration)'
1820

19-
- task: NuGetCommand@2
20-
displayName: Restore packages
21-
inputs:
22-
command: restore
23-
restoreSolution: 'Git-Credential-Manager.sln'
24-
configuration: 'Windows$(configuration)'
25-
26-
- task: MSBuild@1
27-
displayName: Compile common code and Windows helpers
28-
inputs:
29-
solution: 'Git-Credential-Manager.sln'
30-
configuration: 'Windows$(configuration)'
31-
32-
- task: VSTest@2
33-
displayName: Run common unit tests
34-
inputs:
35-
testAssemblyVer2: |
36-
out\shared\*.Tests\bin\**\*.Tests.dll
37-
configuration: 'Windows$(configuration)'
38-
otherConsoleOptions: '/Framework:.NETCoreApp,Version=2.1'
39-
testRunTitle: 'Unit tests - common (Windows)'
40-
41-
# Uncomment once Windows helpers have unit tests
42-
# - task: VSTest@2
43-
# displayName: Run helpers unit tests
44-
# inputs:
45-
# testAssemblyVer2: |
46-
# out\windows\*.Tests\bin\**\*.Tests.dll
47-
# configuration: 'Windows$(configuration)'
48-
# otherConsoleOptions: '/Framework:.NETFramework,Version=v4.6.1'
49-
# testRunTitle: 'Unit tests - helpers (Windows)'
21+
- task: DotNetCoreCLI@2
22+
displayName: Run common unit tests
23+
inputs:
24+
command: test
25+
projects: 'Git-Credential-Manager.sln'
26+
arguments: '--configuration=Mac$(configuration)'
27+
publishTestResults: true
28+
testRunTitle: 'Unit tests (Windows)'
5029

‎.vscode/launch.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"request": "launch",
1111
"preLaunchTask": "build",
1212
// If you have changed target frameworks, make sure to update the program path.
13-
"program": "${workspaceFolder}/out/shared/Git-Credential-Manager/bin/Debug/netcoreapp2.1/git-credential-manager-core.dll",
13+
"program": "${workspaceFolder}/out/shared/Git-Credential-Manager/bin/Debug/netcoreapp3.1/git-credential-manager-core.dll",
1414
"args": ["get"],
1515
"cwd": "${workspaceFolder}/out/shared/Git-Credential-Manager",
1616
"console": "integratedTerminal",

‎src/osx/Installer.Mac/Installer.Mac.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.1</TargetFramework>
6+
<TargetFramework>netcoreapp3.1</TargetFramework>
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
88
</PropertyGroup>
99

‎src/osx/Installer.Mac/layout.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ MSAUTH_OUT="$OUT/osx/Microsoft.Authentication.Helper.Mac"
2424
GCM_SRC="$SRC/shared/Git-Credential-Manager"
2525

2626
# Build parameters
27-
FRAMEWORK=netcoreapp2.1
27+
FRAMEWORK=netcoreapp3.1
2828
RUNTIME=osx-x64
2929

3030
# Parse script arguments

‎src/osx/Microsoft.Authentication.Helper.Mac/Microsoft.Authentication.Helper.Mac.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.1</TargetFramework>
6+
<TargetFramework>netcoreapp3.1</TargetFramework>
77
<IsTestProject>false</IsTestProject>
88
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
99
<GenerateAssemblyVersionInfo>false</GenerateAssemblyVersionInfo>

‎src/osx/Microsoft.Authentication.Helper.Mac/Microsoft.Authentication.Helper.xcodeproj/project.pbxproj‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -216,20 +216,15 @@
216216
files = (
217217
);
218218
inputFileListPaths = (
219-
);
220-
inputPaths = (
221-
"${SRCROOT}/Pods/Target Support Files/Pods-Microsoft.Authentication.Helper/Pods-Microsoft.Authentication.Helper-resources.sh",
222-
"${PODS_ROOT}/ADAL/ADAL/resources/mac/ADCredentialViewController.xib",
219+
"${PODS_ROOT}/Target Support Files/Pods-Microsoft.Authentication.Helper/Pods-Microsoft.Authentication.Helper-resources-${CONFIGURATION}-input-files.xcfilelist",
223220
);
224221
name = "[CP] Copy Pods Resources";
225222
outputFileListPaths = (
226-
);
227-
outputPaths = (
228-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ADCredentialViewController.nib",
223+
"${PODS_ROOT}/Target Support Files/Pods-Microsoft.Authentication.Helper/Pods-Microsoft.Authentication.Helper-resources-${CONFIGURATION}-output-files.xcfilelist",
229224
);
230225
runOnlyForDeploymentPostprocessing = 0;
231226
shellPath = /bin/sh;
232-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Microsoft.Authentication.Helper/Pods-Microsoft.Authentication.Helper-resources.sh\"\n";
227+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Microsoft.Authentication.Helper/Pods-Microsoft.Authentication.Helper-resources.sh\"\n";
233228
showEnvVarsInLog = 0;
234229
};
235230
/* End PBXShellScriptBuildPhase section */

‎src/osx/Microsoft.Authentication.Helper.Mac/Podfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ DEPENDENCIES:
88
- ADAL (~> 4.0.0)
99

1010
SPEC REPOS:
11-
https://github.com/cocoapods/specs.git:
11+
https://github.com/CocoaPods/Specs.git:
1212
- ADAL
1313

1414
SPEC CHECKSUMS:
1515
ADAL: 2f09070fb5a7095172e34409459eca3f3f1d0d23
1616

1717
PODFILE CHECKSUM: f7b3f5867bd6bb83186e92dedf7b8183795ffc5d
1818

19-
COCOAPODS: 1.5.3
19+
COCOAPODS: 1.9.1

‎src/osx/SignFiles.Mac/SignFiles.Mac.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.1</TargetFramework>
6+
<TargetFramework>netcoreapp3.1</TargetFramework>
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
88
<!-- MicroBuild hack: override OutDir to make all files we want to sign under it. -->
99
<OutDir>$(RootDir)</OutDir>

0 commit comments

Comments
 (0)