Skip to content

Commit 27b37fe

Browse files
tminkatminka
authored
Use .NET 4.6.2 instead of 4.6.1 (#415)
* QuantileEstimator throws on NaN arguments
1 parent 96a5cd5 commit 27b37fe

File tree

34 files changed

+70
-69
lines changed

34 files changed

+70
-69
lines changed

‎BUILDING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
To build from source, you must first clone the repository.
77
Next decide whether you want to use a code editor like Visual Studio (recommended) or the command line.
88
When building, you must select a configuration.
9-
All of the Infer.NET libraries target .NET Standard 2.0. Projects that produce executables (including test projects) mostly target .NET Framework 4.6.1, .NET Core 3.1, or both depending on build configuration:
9+
All of the Infer.NET libraries target .NET Standard 2.0. Projects that produce executables (including test projects) mostly target .NET Framework 4.6.2, .NET Core 3.1, or both depending on build configuration:
1010

1111
| Configurations | Targeted Frameworks |
1212
|:---|---:|
13-
| Debug, Release | both .NET Framework 4.6.1 and .NET Core 3.1 |
14-
| DebugFull, ReleaseFull | .NET Framework 4.6.1 only |
13+
| Debug, Release | both .NET Framework 4.6.2 and .NET Core 3.1 |
14+
| DebugFull, ReleaseFull | .NET Framework 4.6.2 only |
1515
| DebugCore, ReleaseCore | .NET Core 3.1 only |
1616

1717

@@ -76,7 +76,7 @@ There are three test assemblies in the solution:
7676
- **TestPublic.dll** in the folder `test/TestPublic`.
7777
- **Microsoft.ML.Probabilistic.Learners.Tests.dll** in the folder `test/Learners/LearnersTests`.
7878

79-
Depending on the build configuration and targeted framework, the assemblies will be located in the `bin/Debug<Core|Full>/<net5.0|net461>` or `bin/Release<Core|Full>/<net5.0|net461>` subdirectories
79+
Depending on the build configuration and targeted framework, the assemblies will be located in the `bin/Debug<Core|Full>/<net5.0|net462>` or `bin/Release<Core|Full>/<net5.0|net462>` subdirectories
8080
of the test project.
8181

8282
Runner executes tests in parallel by default. However, some test category must be run

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ and many others.
2929

3030
## Installing pre-built binaries
3131

32-
Binaries for Infer.NET are located on [nuget.org](https://www.nuget.org/packages?q=Microsoft.ML.Probabilistic). These binaries are cross-platform and work anywhere that .NET is supported, so there is no need to select your platform. The core packages target .NET Standard 2.0, making them useable from any project that targets .NET framework version 4.6.1 or .NET Core 3.1, as explained at [.NET implementation support](https://docs.microsoft.com/en-us/dotnet/standard/net-standard). You do not need to clone the GitHub repository to use the pre-built binaries.
32+
Binaries for Infer.NET are located on [nuget.org](https://www.nuget.org/packages?q=Microsoft.ML.Probabilistic). These binaries are cross-platform and work anywhere that .NET is supported, so there is no need to select your platform. The core packages target .NET Standard 2.0, making them useable from any project that targets .NET framework version 4.6.2 or .NET Core 3.1, as explained at [.NET implementation support](https://docs.microsoft.com/en-us/dotnet/standard/net-standard). You do not need to clone the GitHub repository to use the pre-built binaries.
3333

3434
There currently are [four maintained Infer.NET nuget packages](https://www.nuget.org/packages?q=Microsoft.ML.Probabilistic):
3535

‎build/all-compiler-options.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
configuration: '$(Configuration)'
4848

4949
- script: |
50-
test\TestAllCompilerOptions\bin\$(Configuration)\net461\TestAllCompilerOptions.exe
50+
test\TestAllCompilerOptions\bin\$(Configuration)\net462\TestAllCompilerOptions.exe
5151
displayName: 'Run test'
5252
5353
# Clean up the process if the script timeout out.

‎build/copyassemblies.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ cp ../src/Learners/Recommender/${src}/Microsoft.ML.Probabilistic.Learners.Recomm
3939
cp ../src/Learners/Recommender/${src}/Microsoft.ML.Probabilistic.Learners.Recommender.pdb ${dst}
4040
cp ../src/Learners/Recommender/${src}/Microsoft.ML.Probabilistic.Learners.Recommender.xml ${dst}
4141

42-
mkdir "${out}/net461"
43-
dst="${out}/net461"
44-
src="bin/${configuration}/net461"
42+
mkdir "${out}/net462"
43+
dst="${out}/net462"
44+
src="bin/${configuration}/net462"
4545

4646
cp ../src/Visualizers/Windows/${src}/Microsoft.ML.Probabilistic.Compiler.Visualizers.Windows.dll ${dst}
4747
cp ../src/Visualizers/Windows/${src}/Microsoft.ML.Probabilistic.Compiler.Visualizers.Windows.pdb ${dst}

‎build/evaluator-netframework.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ steps:
1414
inputs:
1515
targetType: 'inline'
1616
script: ./Evaluator.exe InferNetRunsOnly.xml
17-
workingDirectory: ${{ format('src/Learners/Runners/Evaluator/bin/{0}/net461', parameters.Configuration) }}
17+
workingDirectory: ${{ format('src/Learners/Runners/Evaluator/bin/{0}/net462', parameters.Configuration) }}
1818
displayName: Running Evaluator
1919
continueOnError: true

‎build/vstest-fast.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# The .NET Foundation licenses this file to you under the MIT license.
33
# See the LICENSE file in the project root for more information.
44

5-
# Template for running fast test suite (~30 minutes) using vstest in Windows environment (.NET 4.6.1)
5+
# Template for running fast test suite (~30 minutes) using vstest in Windows environment (.NET 4.6.2)
66

77
parameters:
88
Platform: 'x64' # or 'x86' or both
@@ -14,7 +14,7 @@ steps:
1414
displayName: Unit tests x64 (sequential)
1515
inputs:
1616
testSelector: 'testAssemblies'
17-
testAssemblyVer2: test/Tests/bin/*/net461/Microsoft.ML.Probabilistic.Tests.dll
17+
testAssemblyVer2: test/Tests/bin/*/net462/Microsoft.ML.Probabilistic.Tests.dll
1818
testFiltercriteria: '(Platform!=x86)&(((Category=CsoftModel)|(Category=ModifiesGlobals)|(Category=DistributedTests)|(Category=Performance))&(Category!=OpenBug)&(Category!=BadTest)&(Category!=CompilerOptionsTest))'
1919
runInParallel: false
2020
runSettingsFile: test.runsettings
@@ -23,9 +23,9 @@ steps:
2323
inputs:
2424
testSelector: 'testAssemblies'
2525
testAssemblyVer2: |
26-
test/Tests/bin/*/net461/Microsoft.ML.Probabilistic.Tests.dll
27-
test/Learners/LearnersTests/bin/*/net461/Microsoft.ML.Probabilistic.Learners.Tests.dll
28-
test/TestPublic/bin/*/net461/TestPublic.dll
26+
test/Tests/bin/*/net462/Microsoft.ML.Probabilistic.Tests.dll
27+
test/Learners/LearnersTests/bin/*/net462/Microsoft.ML.Probabilistic.Learners.Tests.dll
28+
test/TestPublic/bin/*/net462/TestPublic.dll
2929
testFiltercriteria: '(Platform!=x86)&(Category!=OpenBug)&(Category!=BadTest)&(Category!=CompilerOptionsTest)&(Category!=CsoftModel)&(Category!=ModifiesGlobals)&(Category!=DistributedTest)&(Category!=Performance)'
3030
runInParallel: true
3131
runSettingsFile: test.runsettings
@@ -35,7 +35,7 @@ steps:
3535
displayName: Unit tests x86 (sequential)
3636
inputs:
3737
testSelector: 'testAssemblies'
38-
testAssemblyVer2: test/Tests/bin/*/net461/Microsoft.ML.Probabilistic.Tests.dll
38+
testAssemblyVer2: test/Tests/bin/*/net462/Microsoft.ML.Probabilistic.Tests.dll
3939
testFiltercriteria: '(Platform!=x64)&(((Category=CsoftModel)|(Category=ModifiesGlobals)|(Category=DistributedTests)|(Category=Performance))&(Category!=OpenBug)&(Category!=BadTest)&(Category!=CompilerOptionsTest))'
4040
runInParallel: false
4141
runSettingsFile: x86.runsettings
@@ -44,9 +44,9 @@ steps:
4444
inputs:
4545
testSelector: 'testAssemblies'
4646
testAssemblyVer2: |
47-
test/Tests/bin/*/net461/Microsoft.ML.Probabilistic.Tests.dll
48-
test/Learners/LearnersTests/bin/*/net461/Microsoft.ML.Probabilistic.Learners.Tests.dll
49-
test/TestPublic/bin/*/net461/TestPublic.dll
47+
test/Tests/bin/*/net462/Microsoft.ML.Probabilistic.Tests.dll
48+
test/Learners/LearnersTests/bin/*/net462/Microsoft.ML.Probabilistic.Learners.Tests.dll
49+
test/TestPublic/bin/*/net462/TestPublic.dll
5050
testFiltercriteria: '(Platform!=x64)&(Category!=OpenBug)&(Category!=BadTest)&(Category!=CompilerOptionsTest)&(Category!=CsoftModel)&(Category!=ModifiesGlobals)&(Category!=DistributedTest)&(Category!=Performance)'
5151
runInParallel: true
5252
runSettingsFile: x86.runsettings

‎src/Examples/ClickThroughModel/ClickThroughModel.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<Choose>
1313
<When Condition="'$(Configuration)'=='DebugFull' OR '$(Configuration)'=='ReleaseFull'">
1414
<PropertyGroup>
15-
<TargetFramework>net461</TargetFramework>
15+
<TargetFramework>net462</TargetFramework>
1616
</PropertyGroup>
1717
</When>
1818
<When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
@@ -22,7 +22,7 @@
2222
</When>
2323
<Otherwise>
2424
<PropertyGroup>
25-
<TargetFrameworks>net5.0-windows;net461</TargetFrameworks>
25+
<TargetFrameworks>net5.0-windows;net462</TargetFrameworks>
2626
</PropertyGroup>
2727
</Otherwise>
2828
</Choose>

‎src/Examples/ClinicalTrial/ClinicalTrial.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<Choose>
1414
<When Condition="'$(Configuration)'=='DebugFull' OR '$(Configuration)'=='ReleaseFull'">
1515
<PropertyGroup>
16-
<TargetFramework>net461</TargetFramework>
16+
<TargetFramework>net462</TargetFramework>
1717
</PropertyGroup>
1818
</When>
1919
<When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
@@ -23,7 +23,7 @@
2323
</When>
2424
<Otherwise>
2525
<PropertyGroup>
26-
<TargetFrameworks>net5.0-windows;net461</TargetFrameworks>
26+
<TargetFrameworks>net5.0-windows;net462</TargetFrameworks>
2727
</PropertyGroup>
2828
</Otherwise>
2929
</Choose>

‎src/Examples/Crowdsourcing/Crowdsourcing.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="$(MSBuildThisFileDirectory)..\..\..\build\common.props" />
33

44
<PropertyGroup>
@@ -12,7 +12,7 @@
1212
<Choose>
1313
<When Condition="'$(Configuration)'=='DebugFull' OR '$(Configuration)'=='ReleaseFull'">
1414
<PropertyGroup>
15-
<TargetFramework>net461</TargetFramework>
15+
<TargetFramework>net462</TargetFramework>
1616
</PropertyGroup>
1717
</When>
1818
<When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
@@ -22,7 +22,7 @@
2222
</When>
2323
<Otherwise>
2424
<PropertyGroup>
25-
<TargetFrameworks>net5.0;net461</TargetFrameworks>
25+
<TargetFrameworks>net5.0;net462</TargetFrameworks>
2626
</PropertyGroup>
2727
</Otherwise>
2828
</Choose>

‎src/Examples/CrowdsourcingWithWords/CrowdsourcingWithWords.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<Choose>
1212
<When Condition="'$(Configuration)'=='DebugFull' OR '$(Configuration)'=='ReleaseFull'">
1313
<PropertyGroup>
14-
<TargetFramework>net461</TargetFramework>
14+
<TargetFramework>net462</TargetFramework>
1515
</PropertyGroup>
1616
</When>
1717
<When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
@@ -21,7 +21,7 @@
2121
</When>
2222
<Otherwise>
2323
<PropertyGroup>
24-
<TargetFrameworks>net5.0;net461</TargetFrameworks>
24+
<TargetFrameworks>net5.0;net462</TargetFrameworks>
2525
</PropertyGroup>
2626
</Otherwise>
2727
</Choose>

0 commit comments

Comments
 (0)