Skip to content

Commit 94af826

Browse files
mstfblmstfbl
authored
Updates NetCoreApp 3.0 builds to NetCoreApp 3.1 (dotnet#4888)
* Update .vsts-dotnet-ci.yml * Changed 3.0 references to 3.1 * Update DotnetCLIVersion.txt * Update Microsoft.ML.sln * Update BuildToolsVersion.txt * Update DotnetCLIVersion.txt * Fixing small typos
1 parent 25f8c5b commit 94af826

File tree

28 files changed

+577
-577
lines changed

28 files changed

+577
-577
lines changed

‎.vsts-dotnet-ci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@ resources:
1313
jobs:
1414
- template: /build/ci/job-template.yml
1515
parameters:
16-
name: Centos_x64_NetCoreApp30
16+
name: Centos_x64_NetCoreApp31
1717
buildScript: ./build.sh
1818
container: CentosContainer
1919
customMatrixes:
2020
Debug_Build:
21-
_configuration: Debug-netcoreapp3_0
21+
_configuration: Debug-netcoreapp3_1
2222
_config_short: DI
2323
_includeBenchmarkData: false
24-
_targetFramework: netcoreapp3.0
24+
_targetFramework: netcoreapp3.1
2525
Release_Build:
26-
_configuration: Release-netcoreapp3_0
26+
_configuration: Release-netcoreapp3_1
2727
_config_short: RI
2828
_includeBenchmarkData: true
29-
_targetFramework: netcoreapp3.0
29+
_targetFramework: netcoreapp3.1
3030
innerLoop: true
3131
pool:
3232
name: Hosted Ubuntu 1604
@@ -50,19 +50,19 @@ jobs:
5050

5151
- template: /build/ci/job-template.yml
5252
parameters:
53-
name: Windows_x64_NetCoreApp30
53+
name: Windows_x64_NetCoreApp31
5454
buildScript: build.cmd
5555
customMatrixes:
5656
Debug_Build:
57-
_configuration: Debug-netcoreapp3_0
57+
_configuration: Debug-netcoreapp3_1
5858
_config_short: DI
5959
_includeBenchmarkData: false
60-
_targetFramework: netcoreapp3.0
60+
_targetFramework: netcoreapp3.1
6161
Release_Build:
62-
_configuration: Release-netcoreapp3_0
62+
_configuration: Release-netcoreapp3_1
6363
_config_short: RI
6464
_includeBenchmarkData: true
65-
_targetFramework: netcoreapp3.0
65+
_targetFramework: netcoreapp3.1
6666
innerLoop: true
6767
vsTestConfiguration: "/Framework:.NETCoreApp,Version=v3.0"
6868
pool:

‎BuildToolsVersion.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.0-preview1-03801-01
1+
3.0.0-preview4-04926-01

‎Directory.Build.props

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

77
<PropertyGroup>
88
<Configuration Condition="'$(Configuration)'==''">Debug</Configuration>
9-
<Configurations>Debug;Release;Debug-netcoreapp3_0;Release-netcoreapp3_0;Debug-netfx;Release-netfx</Configurations>
9+
<Configurations>Debug;Release;Debug-netcoreapp3_1;Release-netcoreapp3_1;Debug-netfx;Release-netfx</Configurations>
1010
<Platform Condition="'$(Platform)'==''">AnyCPU</Platform>
1111
<TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>
1212
<NativeTargetArchitecture Condition="'$(NativeTargetArchitecture)' == ''">$(TargetArchitecture)</NativeTargetArchitecture>
@@ -108,7 +108,7 @@
108108
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
109109
</PropertyGroup>
110110

111-
<!-- Need to explicitly set these properties for the -netcoreapp3_0 or -netfx configurations becuase they are typically based off 'Debug' or 'Release' configs -->
111+
<!-- Need to explicitly set these properties for the -netcoreapp3_1 or -netfx configurations becuase they are typically based off 'Debug' or 'Release' configs -->
112112
<!-- Taken from https://github.com/dotnet/sdk/blob/073c98b92c81066c6c2e17c3674adbb6e833409a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props#L41-L47 -->
113113
<PropertyGroup Condition="$(Configuration.StartsWith('Debug'))">
114114
<DebugSymbols>true</DebugSymbols>

‎DotnetCLIVersion.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.100
1+
3.1.102

‎Microsoft.ML.sln

Lines changed: 496 additions & 496 deletions
Large diffs are not rendered by default.

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,13 @@ To build ML.NET from source please visit our [developers guide](docs/project-doc
7979

8080
| | Debug | Release |
8181
|:---|----------------:|------------------:|
82-
|**CentOS**|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/machinelearning/MachineLearning-CI?branchName=master&jobName=Centos_x64_NetCoreApp30&configuration=Centos_x64_NetCoreApp30%20Debug_Build)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=104&branchName=master)|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/machinelearning/MachineLearning-CI?branchName=master&jobName=Centos_x64_NetCoreApp30&configuration=Centos_x64_NetCoreApp30%20Release_Build)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=104&branchName=master)|
82+
|**CentOS**|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/machinelearning/MachineLearning-CI?branchName=master&jobName=Centos_x64_NetCoreApp31&configuration=Centos_x64_NetCoreApp31%20Debug_Build)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=104&branchName=master)|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/machinelearning/MachineLearning-CI?branchName=master&jobName=Centos_x64_NetCoreApp31&configuration=Centos_x64_NetCoreApp31%20Release_Build)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=104&branchName=master)|
8383
|**Ubuntu**|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/machinelearning/MachineLearning-CI?branchName=master&jobName=Ubuntu_x64_NetCoreApp21&configuration=Ubuntu_x64_NetCoreApp21%20Debug_Build)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=104&branchName=master)|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/machinelearning/MachineLearning-CI?branchName=master&jobName=Ubuntu_x64_NetCoreApp21&configuration=Ubuntu_x64_NetCoreApp21%20Release_Build)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=104&branchName=master)|
8484
|**macOS**|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/machinelearning/MachineLearning-CI?branchName=master&jobName=MacOS_x64_NetCoreApp21&configuration=MacOS_x64_NetCoreApp21%20Debug_Build)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=104&branchName=master)|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/machinelearning/MachineLearning-CI?branchName=master&jobName=MacOS_x64_NetCoreApp21&configuration=MacOS_x64_NetCoreApp21%20Release_Build)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=104&branchName=master)|
8585
|**Windows x64**|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/machinelearning/MachineLearning-CI?branchName=master&jobName=Windows_x64_NetCoreApp21&configuration=Windows_x64_NetCoreApp21%20Debug_Build)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=104&branchName=master)|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/machinelearning/MachineLearning-CI?branchName=master&jobName=Windows_x64_NetCoreApp21&configuration=Windows_x64_NetCoreApp21%20Release_Build)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=104&branchName=master)|
8686
|**Windows FullFramework**|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/machinelearning/MachineLearning-CI?branchName=master&jobName=Windows_x64_NetFx461&configuration=Windows_x64_NetFx461%20Debug_Build)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=104&branchName=master)|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/machinelearning/MachineLearning-CI?branchName=master&jobName=Windows_x64_NetFx461&configuration=Windows_x64_NetFx461%20Release_Build)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=104&branchName=master)|
8787
|**Windows x86**|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/machinelearning/MachineLearning-CI?branchName=master&jobName=Windows_x86_NetCoreApp21&configuration=Windows_x86_NetCoreApp21%20Debug_Build)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=104&branchName=master)|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/machinelearning/MachineLearning-CI?branchName=master&jobName=Windows_x86_NetCoreApp21&configuration=Windows_x86_NetCoreApp21%20Release_Build)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=104&branchName=master)|
88-
|**Windows NetCore3.0**|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/machinelearning/MachineLearning-CI?branchName=master&jobName=Windows_x64_NetCoreApp30&configuration=Windows_x64_NetCoreApp30%20Debug_Build)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=104&branchName=master)|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/machinelearning/MachineLearning-CI?branchName=master&jobName=Windows_x64_NetCoreApp30&configuration=Windows_x64_NetCoreApp30%20Release_Build)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=104&branchName=master)|
88+
|**Windows NetCore3.1**|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/machinelearning/MachineLearning-CI?branchName=master&jobName=Windows_x64_NetCoreApp31&configuration=Windows_x64_NetCoreApp31%20Debug_Build)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=104&branchName=master)|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/machinelearning/MachineLearning-CI?branchName=master&jobName=Windows_x64_NetCoreApp31&configuration=Windows_x64_NetCoreApp31%20Release_Build)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=104&branchName=master)|
8989

9090
## Release process and versioning
9191

‎build/.night-build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,17 @@ resources:
3131
jobs:
3232
- template: /build/ci/job-template.yml
3333
parameters:
34-
name: Centos_x64_NetCoreApp30
34+
name: Centos_x64_NetCoreApp31
3535
buildScript: ./build.sh
3636
container: CentosContainer
3737
customMatrixes:
3838
Debug_Build:
39-
_configuration: Debug-netcoreapp3_0
39+
_configuration: Debug-netcoreapp3_1
4040
_config_short: DI
4141
_targetFramework: netcoreapp3.0
4242
_includeBenchmarkData: false
4343
Release_Build:
44-
_configuration: Release-netcoreapp3_0
44+
_configuration: Release-netcoreapp3_1
4545
_config_short: RI
4646
_targetFramework: netcoreapp3.0
4747
_includeBenchmarkData: true
@@ -68,15 +68,15 @@ jobs:
6868

6969
- template: /build/ci/job-template.yml
7070
parameters:
71-
name: Windows_x64_NetCoreApp30
71+
name: Windows_x64_NetCoreApp31
7272
buildScript: build.cmd
7373
customMatrixes:
7474
Debug_Build:
75-
_configuration: Debug-netcoreapp3_0
75+
_configuration: Debug-netcoreapp3_1
7676
_config_short: DI
7777
_includeBenchmarkData: false
7878
Release_Build:
79-
_configuration: Release-netcoreapp3_0
79+
_configuration: Release-netcoreapp3_1
8080
_config_short: RI
8181
_includeBenchmarkData: true
8282
nightlyBuild: true

‎build/.outer-loop-build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@ resources:
3232
jobs:
3333
- template: /build/ci/job-template.yml
3434
parameters:
35-
name: Centos_x64_NetCoreApp30
35+
name: Centos_x64_NetCoreApp31
3636
buildScript: ./build.sh
3737
container: CentosContainer
3838
customMatrixes:
3939
Debug_Build:
40-
_configuration: Debug-netcoreapp3_0
40+
_configuration: Debug-netcoreapp3_1
4141
_config_short: DI
4242
_includeBenchmarkData: false
4343
Release_Build:
44-
_configuration: Release-netcoreapp3_0
44+
_configuration: Release-netcoreapp3_1
4545
_config_short: RI
4646
_includeBenchmarkData: true
4747
pool:
@@ -64,15 +64,15 @@ jobs:
6464

6565
- template: /build/ci/job-template.yml
6666
parameters:
67-
name: Windows_x64_NetCoreApp30
67+
name: Windows_x64_NetCoreApp31
6868
buildScript: build.cmd
6969
customMatrixes:
7070
Debug_Build:
71-
_configuration: Debug-netcoreapp3_0
71+
_configuration: Debug-netcoreapp3_1
7272
_config_short: DI
7373
_includeBenchmarkData: false
7474
Release_Build:
75-
_configuration: Release-netcoreapp3_0
75+
_configuration: Release-netcoreapp3_1
7676
_config_short: RI
7777
_includeBenchmarkData: true
7878
pool:

‎config.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"Configuration": {
44
"description": "Sets the optimization level for the Build Configuration you want to build.",
55
"valueType": "property",
6-
"values": [ "Debug", "Release", "Debug-netcoreapp3_0", "Release-netcoreapp3_0", "Debug-netfx", "Release-netfx" ],
6+
"values": [ "Debug", "Release", "Debug-netcoreapp3_1", "Release-netcoreapp3_1", "Debug-netfx", "Release-netfx" ],
77
"defaultValue": "Debug"
88
},
99
"TargetArchitecture": {
@@ -124,16 +124,16 @@
124124
"Configuration": "Release"
125125
}
126126
},
127-
"debug-netcoreapp3_0": {
128-
"description": "Sets optimization level to debug for managed build configuration and builds against netcoreapp3.0. (/p:Configuration=Debug-netcoreapp3_0)",
127+
"debug-netcoreapp3_1": {
128+
"description": "Sets optimization level to debug for managed build configuration and builds against netcoreapp3.1. (/p:Configuration=Debug-netcoreapp3_1)",
129129
"settings": {
130-
"Configuration": "Debug-netcoreapp3_0"
130+
"Configuration": "Debug-netcoreapp3_1"
131131
}
132132
},
133-
"release-netcoreapp3_0": {
134-
"description": "Sets optimization level to release for managed build configuration and builds against netcoreapp3.0. (/p:Configuration=Release-netcoreapp3_0)",
133+
"release-netcoreapp3_1": {
134+
"description": "Sets optimization level to release for managed build configuration and builds against netcoreapp3.1. (/p:Configuration=Release-netcoreapp3_1)",
135135
"settings": {
136-
"Configuration": "Release-netcoreapp3_0"
136+
"Configuration": "Release-netcoreapp3_1"
137137
}
138138
},
139139
"debug-netfx": {

‎docs/building/netcoreapp3.0-instructions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
ML.NET now builds for .NET Core 3.0 by default. However to run tests on .NET Core 3.0, you need to do a few manual steps.
22

3-
1. Run `.\build.cmd -- /p:Configuration=Release-netcoreapp3_0` or `.\build.cmd -Release-netcoreapp3_0` from the root of the repo.
3+
1. Run `.\build.cmd -- /p:Configuration=Release-netcoreapp3_1` or `.\build.cmd -Release-netcoreapp3_1` from the root of the repo.
44
2. If you want to build the NuGet packages, `.\build.cmd -buildPackages` after step 1.
55

66
If you are using Visual Studio, you will need to do the following:
77

8-
1. In the Configuration Manager, switch the current configuration to `Debug-netcoreapp3_0` or `Release-netcoreapp3_0`.
8+
1. In the Configuration Manager, switch the current configuration to `Debug-netcoreapp3_1` or `Release-netcoreapp3_1`.
99
2. Build and test as usual.

‎pkg/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.nupkgproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
55
<PackageDescription>Microsoft.ML.CpuMath contains optimized math routines for ML.NET.</PackageDescription>
66
</PropertyGroup>
77

‎src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
55
<IncludeInPackage>Microsoft.ML.CpuMath</IncludeInPackage>
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
77
<DefineConstants>$(DefineConstants);CPUMATH_INFRASTRUCTURE</DefineConstants>
@@ -16,7 +16,7 @@
1616
<None Include="**/*.cs" />
1717
</ItemGroup>
1818

19-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
19+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
2020
<Compile Remove="CpuMathUtils.netstandard.cs" />
2121
<Compile Remove="FactorizationMachine/FactorizationMachineInterface.netstandard.cs" />
2222
</ItemGroup>

‎src/Native/build.cmd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ set MKL_LIB_PATH=""
1818
:Arg_Loop
1919
if [%1] == [] goto :ToolsVersion
2020
if /i [%1] == [Release] ( set CMAKE_BUILD_TYPE=Release&&shift&goto Arg_Loop)
21-
if /i [%1] == [Release-netcoreapp3_0] ( set CMAKE_BUILD_TYPE=Release-netcoreapp3_0&&shift&goto Arg_Loop)
21+
if /i [%1] == [Release-netcoreapp3_1] ( set CMAKE_BUILD_TYPE=Release-netcoreapp3_1&&shift&goto Arg_Loop)
2222
if /i [%1] == [Release-netfx] ( set CMAKE_BUILD_TYPE=Release-netfx&&shift&goto Arg_Loop)
2323
if /i [%1] == [Debug] ( set CMAKE_BUILD_TYPE=Debug&&shift&goto Arg_Loop)
24-
if /i [%1] == [Debug-netcoreapp3_0] ( set CMAKE_BUILD_TYPE=Debug-netcoreapp3_0&&shift&goto Arg_Loop)
24+
if /i [%1] == [Debug-netcoreapp3_1] ( set CMAKE_BUILD_TYPE=Debug-netcoreapp3_1&&shift&goto Arg_Loop)
2525
if /i [%1] == [Debug-netfx] ( set CMAKE_BUILD_TYPE=Debug-netfx&&shift&goto Arg_Loop)
2626

2727
if /i [%1] == [x86] ( set __BuildArch=x86&&set __VCBuildArch=x86&&shift&goto Arg_Loop)
@@ -104,8 +104,8 @@ if %__IntermediatesDir% == "" (
104104
set "__CMakeBinDir=%__CMakeBinDir:\=/%"
105105
set "__IntermediatesDir=%__IntermediatesDir:\=/%"
106106

107-
:: Strip the "-netcoreapp3_0" suffix from the build type
108-
if [%CMAKE_BUILD_TYPE:~-14%] == [-netcoreapp3_0] (
107+
:: Strip the "-netcoreapp3_1" suffix from the build type
108+
if [%CMAKE_BUILD_TYPE:~-14%] == [-netcoreapp3_1] (
109109
set CMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE:~0,-14%
110110
)
111111

‎src/Native/build.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<NativePackageAsset Include="$(NativeAssetsBuiltPath)\$(NativeLibPrefix)CpuMathNative$(NativeLibExtension)"
8383
RelativePath="Microsoft.ML.CpuMath\runtimes\$(PackageRid)\nativeassets\netstandard2.0" />
8484
<NativePackageAsset Include="$(PlaceholderFile)"
85-
RelativePath="Microsoft.ML.CpuMath\runtimes\$(PackageRid)\nativeassets\netcoreapp3.0" />
85+
RelativePath="Microsoft.ML.CpuMath\runtimes\$(PackageRid)\nativeassets\netcoreapp3.1" />
8686
<NativePackageAsset Include="$(NativeAssetsBuiltPath)\$(NativeLibPrefix)LdaNative$(NativeLibExtension)"
8787
RelativePath="Microsoft.ML\runtimes\$(PackageRid)\native" />
8888
<NativePackageAsset Include="$(NativeAssetsBuiltPath)\$(NativeLibPrefix)SymSgdNative$(NativeLibExtension)"

‎test/Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<PropertyGroup>
55
<TargetFramework>netcoreapp2.1</TargetFramework>
66
<TargetFramework Condition="$(Configuration.EndsWith('-netfx'))">net461</TargetFramework>
7-
<TargetFramework Condition="$(Configuration.EndsWith('-netcoreapp3_0'))">netcoreapp3.0</TargetFramework>
7+
<TargetFramework Condition="$(Configuration.EndsWith('-netcoreapp3_1'))">netcoreapp3.1</TargetFramework>
88
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net461'">win-x64</RuntimeIdentifier>
99
<IsPackable>false</IsPackable>
1010
<GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -23,7 +23,7 @@
2323
<VSTestLogger>trx</VSTestLogger>
2424
<VSTestResultsDirectory>$(OutputPath)</VSTestResultsDirectory>
2525
<AssemblyOriginatorKeyFile>$(ToolsDir)Test.snk</AssemblyOriginatorKeyFile>
26-
<CopyLocalLockFileAssemblies Condition="'$(TargetFramework)' == 'netcoreapp3.0'">false</CopyLocalLockFileAssemblies>
26+
<CopyLocalLockFileAssemblies Condition="'$(TargetFramework)' == 'netcoreapp3.1'">false</CopyLocalLockFileAssemblies>
2727
</PropertyGroup>
2828

2929
<ItemGroup>

‎test/Microsoft.ML.Benchmarks/Harness/Configs.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ private IToolchain CreateToolchain()
5454

5555
private static string GetBuildConfigurationName()
5656
{
57-
#if NETCOREAPP3_0
58-
return "Release-netcoreapp3_0";
57+
#if NETCOREAPP3_1
58+
return "Release-netcoreapp3_1";
5959
#elif NET461
6060
return "Release-netfx";
6161
#else

‎test/Microsoft.ML.Benchmarks/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,18 @@ To get the total number of allocated managed memory please pass additional conso
4949

5050
## .NET Core 3.0
5151

52-
**Pre-requisite:** Follow the [netcoreapp3.0 instructions](../../docs/building/netcoreapp3.0-instructions.md).
52+
**Pre-requisite:** Follow the [netcoreapp3.1 instructions](../../docs/building/netcoreapp3.1-instructions.md).
5353

5454
**Pre-requisite:** To use dotnet cli from the root directory remember to set `DOTNET_MULTILEVEL_LOOKUP` environment variable to `0`!
5555

5656
$env:DOTNET_MULTILEVEL_LOOKUP=0
5757

5858
1. Navigate to the benchmarks directory (machinelearning\test\Microsoft.ML.Benchmarks)
5959

60-
2. Run the benchmarks in `Release-netcoreapp3_0` configuration, choose one of the benchmarks when prompted
60+
2. Run the benchmarks in `Release-netcoreapp3_1` configuration, choose one of the benchmarks when prompted
6161

6262
```log
63-
..\..\Tools\dotnetcli\dotnet.exe run -c Release-netcoreapp3_0
63+
..\..\Tools\dotnetcli\dotnet.exe run -c Release-netcoreapp3_1
6464
```
6565
## Authoring new benchmarks
6666

0 commit comments

Comments
 (0)