This commit is contained in:
msdmkats 2018-10-10 15:39:20 +03:00 коммит произвёл GitHub
Родитель d323c0f02e
Коммит c003b11dad
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
25 изменённых файлов: 30 добавлений и 30 удалений

Просмотреть файл

@ -4,7 +4,7 @@ VisualStudioVersion = 15.0.27428.2005
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A181C943-2E01-454D-9008-2E3C53AA09CC}"
ProjectSection(SolutionItems) = preProject
Infer2.snk = Infer2.snk
Infer.snk = Infer.snk
TestRunConfig1.testrunconfig = TestRunConfig1.testrunconfig
EndProjectSection
ProjectSection(FolderStartupServices) = postProject

Просмотреть файл

Просмотреть файл

@ -65,7 +65,7 @@ Documentation can be found on the [Infer.NET website](https://dotnet.github.
## Structure of Repository
* The Visual Studio solution `Infer2.sln` in the root of the repository contains all Infer.NET components, unit tests and sample programs from the folders described below.
* The Visual Studio solution `Infer.sln` in the root of the repository contains all Infer.NET components, unit tests and sample programs from the folders described below.
* `src/`
@ -138,7 +138,7 @@ All of the Infer.NET libraries target .NET Standard 2.0. Projects that produ
If you don't have Visual Studio 2017, you can install the free [Visual Studio 2017 Community](https://visualstudio.microsoft.com/vs/community/).
#### Build and test
You can load `Infer2.sln` solution located in the root of repository into Visual Studio and build all libraries and samples.
You can load `Infer.sln` solution located in the root of repository into Visual Studio and build all libraries and samples.
**NB!** The solution has a number of build configurations that allows building either for all supported frameworks simultaneously or only for a specific one, but in order for Visual Studio to behave correctly, the solution needs to be closed and re-opened after switching between such configurations.
@ -160,21 +160,21 @@ All components of Infer.NET and almost all sample projects run on .NET Core
To build .NET Standard libraries and .NET Core executables, run in the root of the repository either
```bash
dotnet build -c DebugCore Infer2.sln
dotnet build -c DebugCore Infer.sln
```
to build debug assemblies, or
```bash
dotnet build -c ReleaseCore Infer2.sln
dotnet build -c ReleaseCore Infer.sln
```
to build release assemblies.
The corresponding commands to build .NET Standard libraries and .NET Framework executables with Mono are
```bash
msbuild /c:DebugFull /p:MonoSupport=true /restore Infer2.sln
msbuild /c:DebugFull /p:MonoSupport=true /restore Infer.sln
```
and
```bash
msbuild /c:ReleaseFull /p:MonoSupport=true /restore Infer2.sln
msbuild /c:ReleaseFull /p:MonoSupport=true /restore Infer.sln
```
Please, expect build failure messages about examples that use WPF GUI. Libraries and executables that don't reference WPF should build, though.

Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<TestRunConfiguration name="TestRunConfig1" id="8de3ef11-ed64-4bd5-bbd8-d35dd5a63e94" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
<Description>This is a default test run configuration for a local test run.</Description>
<CodeCoverage keyFile="Infer2.snk" />
<CodeCoverage keyFile="Infer.snk" />
<Timeouts testTimeout="300000" />
<TestTypeSpecific>
<WebTestRunConfiguration testTypeId="4e7599fa-5ecb-43e9-a887-cd63cf72d207">

Просмотреть файл

@ -19,7 +19,7 @@ steps:
version: '2.1.403'
- script: |
dotnet build /p:DisableImplicitNuGetFallbackFolder=true --configuration $(BuildConfiguration)Core Infer2.sln
dotnet build /p:DisableImplicitNuGetFallbackFolder=true --configuration $(BuildConfiguration)Core Infer.sln
displayName: Build Solution
- template: netcoretest-fast.yml

Просмотреть файл

@ -20,7 +20,7 @@ steps:
version: '2.1.403'
- script: |
dotnet build /p:DisableImplicitNuGetFallbackFolder=true --configuration $(buildConfiguration)Core Infer2.sln
dotnet build /p:DisableImplicitNuGetFallbackFolder=true --configuration $(buildConfiguration)Core Infer.sln
displayName: Build Solution
- template: netcoretest-fast.yml

Просмотреть файл

@ -25,7 +25,7 @@ jobs:
version: '2.1.403'
- script: |
dotnet build --configuration $(BuildConfiguration)Core Infer2.sln
dotnet build --configuration $(BuildConfiguration)Core Infer.sln
displayName: Build Solution
- template: netcoretest-fast.yml
@ -44,7 +44,7 @@ jobs:
version: '2.1.403'
- script: |
dotnet build --configuration $(BuildConfiguration)Core Infer2.sln
dotnet build --configuration $(BuildConfiguration)Core Infer.sln
displayName: Build Solution
- template: netcoretest-fast.yml

Просмотреть файл

@ -3,7 +3,7 @@
<TargetFramework>netstandard2.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\Infer2.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>..\..\Infer.snk</AssemblyOriginatorKeyFile>
<AssemblyName>$(AssemblyNamePrefix)Microsoft.ML.Probabilistic.Compiler</AssemblyName>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

Просмотреть файл

@ -3,7 +3,7 @@
<TargetFramework>netstandard2.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\Infer2.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>..\..\Infer.snk</AssemblyOriginatorKeyFile>
<AssemblyName>Microsoft.ML.Probabilistic.Csoft</AssemblyName>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

Просмотреть файл

@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\Infer2.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>..\..\Infer.snk</AssemblyOriginatorKeyFile>
<AssemblyName>Microsoft.ML.Probabilistic.FSharp</AssemblyName>
<WarningLevel>5</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

Просмотреть файл

@ -3,7 +3,7 @@
<TargetFramework>netstandard2.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\..\Infer2.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>..\..\..\Infer.snk</AssemblyOriginatorKeyFile>
<AssemblyName>$(AssemblyNamePrefix)Microsoft.ML.Probabilistic.Learners.Classifier</AssemblyName>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

Просмотреть файл

@ -3,7 +3,7 @@
<OutputType>Exe</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\..\Infer2.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>..\..\..\Infer.snk</AssemblyOriginatorKeyFile>
<AssemblyName>Microsoft.ML.Probabilistic.Learners.ClassifierModels</AssemblyName>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

Просмотреть файл

@ -3,7 +3,7 @@
<TargetFramework>netstandard2.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\..\Infer2.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>..\..\..\Infer.snk</AssemblyOriginatorKeyFile>
<AssemblyName>$(AssemblyNamePrefix)Microsoft.ML.Probabilistic.Learners</AssemblyName>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

Просмотреть файл

@ -3,7 +3,7 @@
<TargetFramework>netstandard2.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\..\Infer2.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>..\..\..\Infer.snk</AssemblyOriginatorKeyFile>
<AssemblyName>$(AssemblyNamePrefix)Microsoft.ML.Probabilistic.Learners.Recommender</AssemblyName>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

Просмотреть файл

@ -3,7 +3,7 @@
<OutputType>Exe</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\..\Infer2.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>..\..\..\Infer.snk</AssemblyOriginatorKeyFile>
<AssemblyName>Microsoft.ML.Probabilistic.Learners.RecommenderModels</AssemblyName>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

Просмотреть файл

@ -3,7 +3,7 @@
<OutputType>Exe</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\..\..\Infer2.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>..\..\..\..\Infer.snk</AssemblyOriginatorKeyFile>
<AssemblyName>Learner</AssemblyName>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

Просмотреть файл

@ -3,7 +3,7 @@
<TargetFramework>netstandard2.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\..\..\Infer2.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>..\..\..\..\Infer.snk</AssemblyOriginatorKeyFile>
<AssemblyName>Microsoft.ML.Probabilistic.Learners.Runners</AssemblyName>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

Просмотреть файл

@ -3,7 +3,7 @@
<OutputType>Exe</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\..\..\Infer2.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>..\..\..\..\Infer.snk</AssemblyOriginatorKeyFile>
<AssemblyName>Evaluator</AssemblyName>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

Просмотреть файл

@ -3,7 +3,7 @@
<TargetFramework>netstandard2.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\Infer2.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>..\..\Infer.snk</AssemblyOriginatorKeyFile>
<AssemblyName>$(AssemblyNamePrefix)Microsoft.ML.Probabilistic</AssemblyName>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

Просмотреть файл

@ -3,7 +3,7 @@
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<OutputType>Exe</OutputType>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\Infer2.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>..\..\Infer.snk</AssemblyOriginatorKeyFile>
<AssemblyName>Tutorials</AssemblyName>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

Просмотреть файл

@ -3,7 +3,7 @@
<TargetFramework>net461</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\..\Infer2.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>..\..\..\Infer.snk</AssemblyOriginatorKeyFile>
<AssemblyName>Microsoft.ML.Probabilistic.Compiler.Visualizers.Windows</AssemblyName>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

Просмотреть файл

@ -2,7 +2,7 @@
<PropertyGroup>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\..\Infer2.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>..\..\..\Infer.snk</AssemblyOriginatorKeyFile>
<AssemblyName>Microsoft.ML.Probabilistic.Learners.Tests</AssemblyName>
<RootNamespace>Microsoft.ML.Probabilistic.Learners.Tests</RootNamespace>
<DefineConstants>TRACE</DefineConstants>

Просмотреть файл

@ -3,7 +3,7 @@
<OutputType>Exe</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\Infer2.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>..\..\Infer.snk</AssemblyOriginatorKeyFile>
<AssemblyName>Microsoft.ML.Probabilistic.TestApp</AssemblyName>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

Просмотреть файл

@ -2,7 +2,7 @@
<PropertyGroup>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\Infer2.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>..\..\Infer.snk</AssemblyOriginatorKeyFile>
<AssemblyName>TestPublic</AssemblyName>
<RootNamespace>TestPublic</RootNamespace>
<MonoSupport>false</MonoSupport>

Просмотреть файл

@ -3,7 +3,7 @@
<PropertyGroup>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\Infer2.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>..\..\Infer.snk</AssemblyOriginatorKeyFile>
<AssemblyName>Microsoft.ML.Probabilistic.Tests</AssemblyName>
<RootNamespace>Microsoft.ML.Probabilistic.Tests</RootNamespace>
<MonoSupport>false</MonoSupport>