From 68f35c5b0cb22cadc9c5cd97bff6740ba98b8a6a Mon Sep 17 00:00:00 2001 From: Mustafa Bal <5262061+mstfbl@users.noreply.github.com> Date: Wed, 25 Nov 2020 15:09:30 -0800 Subject: [PATCH 1/3] Added fixes for official builds --- build/publish.proj | 21 ++++-- build/sign.proj | 50 ------------- build/vsts-ci.yml | 75 +++++++++---------- eng/Signing.props | 16 +++- eng/Versions.props | 1 + restore.cmd | 3 + restore.sh | 13 ++++ sign.cmd | 3 + .../Microsoft.Extensions.ML.csproj | 1 + .../Microsoft.ML.AutoML.csproj | 1 + .../Microsoft.ML.CodeGenerator.csproj | 1 + .../Microsoft.ML.CpuMath.csproj | 1 + .../Microsoft.ML.DataView.csproj | 1 + ...osoft.ML.DnnImageFeaturizer.AlexNet.csproj | 1 + ...oft.ML.DnnImageFeaturizer.ResNet101.csproj | 1 + ...soft.ML.DnnImageFeaturizer.ResNet18.csproj | 1 + ...soft.ML.DnnImageFeaturizer.ResNet50.csproj | 1 + .../Microsoft.ML.Ensemble.csproj | 1 + .../Microsoft.ML.EntryPoints.csproj | 1 + .../Microsoft.ML.Experimental.csproj | 1 + .../Microsoft.ML.FastTree.csproj | 1 + .../Microsoft.ML.Featurizers.csproj | 1 + .../Microsoft.ML.ImageAnalytics.csproj | 1 + .../Microsoft.ML.LightGbm.csproj | 1 + .../Microsoft.ML.Mkl.Components.csproj | 1 + .../Microsoft.ML.OnnxConverter.csproj | 1 + .../Microsoft.ML.OnnxTransformer.csproj | 1 + .../Microsoft.ML.Parquet.csproj | 1 + .../Microsoft.ML.Recommender.csproj | 1 + .../Microsoft.ML.SamplesUtils.csproj | 1 + .../Microsoft.ML.TensorFlow.csproj | 1 + .../Microsoft.ML.TimeSeries.csproj | 1 + .../Microsoft.ML.Vision.csproj | 1 + 33 files changed, 106 insertions(+), 101 deletions(-) delete mode 100644 build/sign.proj create mode 100644 restore.cmd create mode 100644 restore.sh create mode 100644 sign.cmd diff --git a/build/publish.proj b/build/publish.proj index 065f5294cf..9ac58604ef 100644 --- a/build/publish.proj +++ b/build/publish.proj @@ -1,7 +1,12 @@ + + + + + - + Microsoft.SymbolUploader.Build.Task @@ -9,15 +14,15 @@ 600 - + - + - - - - - - - - - - - $(PackageAssetsPath) - $(PackageOutputPath) - $(IntermediateOutputRootPath) - - - - - - - - - - - - - - - - - Microsoft400 - - - - - - - NuGet - - - - - - - - \ No newline at end of file diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml index c464d8c644..29ea7d5035 100644 --- a/build/vsts-ci.yml +++ b/build/vsts-ci.yml @@ -23,14 +23,18 @@ phases: - agent.os -equals linux container: CentosContainer steps: + - script: ./restore.sh + displayName: restore all projects + - script: ./build.sh -configuration $(BuildConfig) /p:SkipRIDAgnosticAssets=true -projects $(Build.SourcesDirectory)/src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj + displayName: build redist # Only build native assets to avoid conflicts. - - script: ./build.sh -buildNative -$(BuildConfig) -skipRIDAgnosticAssets + - script: ./build.sh -configuration $(BuildConfig) -projects $(Build.SourcesDirectory)/src/Native/Native.proj /p:TargetArchitecture=x64 displayName: Build - task: PublishBuildArtifacts@1 displayName: Publish Linux package assets inputs: - pathToPublish: $(Build.SourcesDirectory)/bin/obj/packages + pathToPublish: $(Build.SourcesDirectory)/artifacts/pkgassets artifactName: PackageAssets artifactType: container @@ -46,23 +50,26 @@ phases: queue: name: Hosted macOS steps: - # Work around MacOS Homebrew image/environment bug: https://github.com/actions/virtual-environments/issues/1811 - script: | brew uninstall openssl@1.0.2t | brew uninstall python@2.7.17 | brew untap local/openssl | brew untap local/python2 displayName: MacOS Homebrew bug Workaround - - script: brew update && brew install $(Build.SourcesDirectory)/build/libomp.rb && brew link libomp --force + - script: brew update && brew unlink python@3.8 && brew install mono-libgdiplus && brew install $(Build.SourcesDirectory)/build/libomp.rb && brew link libomp --force displayName: Install build dependencies + - script: ./restore.sh + displayName: restore all projects + - script: ./build.sh -configuration $(BuildConfig) /p:SkipRIDAgnosticAssets=true -projects $(Build.SourcesDirectory)/src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj + displayName: build redist # Only build native assets to avoid conflicts. - - script: ./build.sh -buildNative -$(BuildConfig) -skipRIDAgnosticAssets + - script: ./build.sh -projects $(Build.SourcesDirectory)/src/Native/Native.proj -configuration $(BuildConfig) /p:TargetArchitecture=x64 displayName: Build - task: PublishBuildArtifacts@1 displayName: Publish macOS package assets inputs: - pathToPublish: $(Build.SourcesDirectory)/bin/obj/packages + pathToPublish: $(Build.SourcesDirectory)/artifacts/pkgassets artifactName: PackageAssets artifactType: container @@ -95,27 +102,26 @@ phases: continueOnError: false condition: and(succeeded(), in(variables._SignType, 'real', 'test')) + - script: ./restore.cmd + displayName: restore all projects + - script: ./build.cmd -configuration $(BuildConfig) /p:SkipRIDAgnosticAssets=true -projects $(Build.SourcesDirectory)/src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj + displayName: build redist # Only build native assets to avoid conflicts. - - script: ./build.cmd -buildNative -$(BuildConfig) -buildArch=x86 -skipRIDAgnosticAssets + - script: ./build.cmd -projects $(Build.SourcesDirectory)/src/Native/Native.proj -configuration $(BuildConfig) /p:TargetArchitecture=x86 displayName: Build - - task: MSBuild@1 - displayName: Sign Windows_x86 Binaries - inputs: - solution: build/sign.proj - msbuildArguments: /p:SignType=$(_SignType) - msbuildVersion: 15.0 - continueOnError: false + - script: ./sign.cmd -configuration $(BuildConfig) /p:TargetArchitecture=x86 /p:SignBinaries=true + displayName: sign binaries - task: PublishBuildArtifacts@1 displayName: Publish Windows_x86 package assets inputs: - pathToPublish: $(Build.SourcesDirectory)/bin/obj/packages + pathToPublish: $(Build.SourcesDirectory)/artifacts/pkgassets artifactName: PackageAssets artifactType: container # Terminate all dotnet build processes. - - script: $(Build.SourcesDirectory)/Tools/dotnetcli/dotnet.exe build-server shutdown + - script: $(Build.SourcesDirectory)/.dotnet/dotnet.exe build-server shutdown displayName: Dotnet Server Shutdown ################################################################################ @@ -148,7 +154,7 @@ phases: condition: and(succeeded(), in(variables._SignType, 'real', 'test')) # Build both native and managed assets. - - script: ./build.cmd -$(BuildConfig) + - script: ./build.cmd -configuration $(BuildConfig) /p:TargetArchitecture=x64 displayName: Build - task: ComponentGovernanceComponentDetection@0 @@ -158,23 +164,18 @@ phases: alertWarningLevel: 'High' - - task: MSBuild@1 - displayName: Sign Windows_x64 Binaries - inputs: - solution: build/sign.proj - msbuildArguments: /p:SignType=$(_SignType) - msbuildVersion: 15.0 - continueOnError: false + - script: ./sign.cmd -configuration $(BuildConfig) /p:TargetArchitecture=x64 /p:SignBinaries=true + displayName: sign binaries - task: PublishBuildArtifacts@1 displayName: Publish Windows_x64 package assets inputs: - pathToPublish: $(Build.SourcesDirectory)/bin/obj/packages + pathToPublish: $(Build.SourcesDirectory)/artifacts/pkgassets artifactName: PackageAssets artifactType: container # Terminate all dotnet build processes. - - script: $(Build.SourcesDirectory)/Tools/dotnetcli/dotnet.exe build-server shutdown + - script: $(Build.SourcesDirectory)/.dotnet/dotnet.exe build-server shutdown displayName: Dotnet Server Shutdown ################################################################################ @@ -220,31 +221,27 @@ phases: displayName: Download package assets inputs: artifactName: PackageAssets - downloadPath: $(Build.SourcesDirectory)/bin/obj/packages + downloadPath: $(Build.SourcesDirectory)/artifacts/pkgassets # Workaround https://github.com/Microsoft/vsts-tasks/issues/6739 - task: CopyFiles@2 displayName: Copy package assets to correct folder inputs: - sourceFolder: $(Build.SourcesDirectory)/bin/obj/packages/PackageAssets - targetFolder: $(Build.SourcesDirectory)/bin/obj/packages + sourceFolder: $(Build.SourcesDirectory)/artifacts/pkgassets/PackageAssets + targetFolder: $(Build.SourcesDirectory)/artifacts/pkgassets - - script: ./build.cmd -buildPackages - displayName: Create Packages + - script: ./build.cmd -pack -configuration $(BuildConfig) + displayName: Build Packages - - task: MSBuild@1 - displayName: Sign Packages - inputs: - solution: build/sign.proj - msbuildArguments: /p:SignType=$(_SignType) /p:SignNugetPackages=true - msbuildVersion: 15.0 + - script: ./sign.cmd /p:SignNugetPackages=true + displayName: sign packages continueOnError: false - task: NuGetAuthenticate@0 inputs: nuGetServiceConnections: machinelearning-dnceng-public-feed # To allow publishing to a feed of another organization - - script: Tools\dotnetcli\dotnet msbuild build\publish.proj /t:PublishPackages /p:NuGetFeedUrl=$(_AzureDevopsFeedUrl) /p:NuGetApiKey=AzureArtifacts + - script: $(Build.SourcesDirectory)\.dotnet\dotnet.exe msbuild build\publish.proj /t:PublishPackages /p:NuGetFeedUrl=$(_AzureDevopsFeedUrl) /p:NuGetApiKey=AzureArtifacts displayName: Publish Packages to AzureDevOps Feed - task: MSBuild@1 @@ -264,5 +261,5 @@ phases: continueOnError: true # Terminate all dotnet build processes. - - script: $(Build.SourcesDirectory)/Tools/dotnetcli/dotnet.exe build-server shutdown + - script: $(Build.SourcesDirectory)/.dotnet/dotnet.exe build-server shutdown displayName: Dotnet Server Shutdown \ No newline at end of file diff --git a/eng/Signing.props b/eng/Signing.props index e0fabfd661..5213afc61e 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -1,6 +1,14 @@ - - - + + + + + + + + + + + \ No newline at end of file diff --git a/eng/Versions.props b/eng/Versions.props index 4e6f0dc406..1571f4a3ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,6 +44,7 @@ 4.3.6 1.0.0-beta.19225.5 1.1.0-beta-20206-02 + 3.0.0-preview4-04926-01 0.12.0 diff --git a/restore.cmd b/restore.cmd new file mode 100644 index 0000000000..185ccb3178 --- /dev/null +++ b/restore.cmd @@ -0,0 +1,3 @@ +@echo off +powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -restore -warnAsError 0 %*" +exit /b %ErrorLevel% \ No newline at end of file diff --git a/restore.sh b/restore.sh new file mode 100644 index 0000000000..e14c4b82ec --- /dev/null +++ b/restore.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +set -e + +SOURCE="${BASH_SOURCE[0]}" +while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink + DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" + SOURCE="$(readlink "$SOURCE")" + [[ "$SOURCE" != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located +done +DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" + +"$DIR/eng/common/build.sh" --restore --warnAsError false "$@" \ No newline at end of file diff --git a/sign.cmd b/sign.cmd new file mode 100644 index 0000000000..6e75c6d287 --- /dev/null +++ b/sign.cmd @@ -0,0 +1,3 @@ +@echo off +powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -sign -warnAsError 0 %*" +exit /b %ErrorLevel% \ No newline at end of file diff --git a/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj b/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj index fa7367e855..3fefadbeb4 100644 --- a/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj +++ b/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj @@ -3,6 +3,7 @@ netstandard2.0 + Microsoft.Extensions.ML An integration package for ML.NET models on scalable web apps and services. diff --git a/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj b/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj index dc086ff8ff..83d749800c 100644 --- a/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj +++ b/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj @@ -3,6 +3,7 @@ netstandard2.0 + Microsoft.ML.AutoML ML.NET AutoML: Optimizes an ML pipeline for your dataset, by automatically locating the best feature engineering, model, and hyperparameters diff --git a/src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj b/src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj index 0358bb3623..955914a780 100644 --- a/src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj +++ b/src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj @@ -3,6 +3,7 @@ netstandard2.0 + Microsoft.ML.CodeGenerator ML.NET Code Generator diff --git a/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj b/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj index 0bd0cf6add..7e39f41e47 100644 --- a/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj +++ b/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj @@ -3,6 +3,7 @@ netstandard2.0;netcoreapp3.1 + Microsoft.ML.CpuMath Microsoft.ML.CpuMath contains optimized math routines for ML.NET. true $(DefineConstants);CPUMATH_INFRASTRUCTURE diff --git a/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj b/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj index cc5dccfcd0..a81ffdaf17 100644 --- a/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj +++ b/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj @@ -3,6 +3,7 @@ netstandard2.0 + Microsoft.ML.DataView Contains the IDataView system which is a set of interfaces and components that provide efficient, compositional processing of schematized data for machine learning and advanced analytics applications. diff --git a/src/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.csproj b/src/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.csproj index a162f54621..ec75b23693 100644 --- a/src/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.csproj +++ b/src/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.csproj @@ -3,6 +3,7 @@ netstandard2.0 + Microsoft.ML.DnnImageFeaturizer.AlexNet ML.NET component for pretrained AlexNet image featurization diff --git a/src/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj b/src/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj index c5f51fb8f5..70dfa08966 100644 --- a/src/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj +++ b/src/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj @@ -3,6 +3,7 @@ netstandard2.0 + Microsoft.ML.DnnImageFeaturizer.ResNet101 ML.NET component for pretrained ResNet101 image featurization diff --git a/src/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj b/src/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj index 370bd0b400..db02568be9 100644 --- a/src/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj +++ b/src/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj @@ -3,6 +3,7 @@ netstandard2.0 + Microsoft.ML.DnnImageFeaturizer.ResNet18 ML.NET component for pretrained ResNet18 image featurization diff --git a/src/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.csproj b/src/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.csproj index 550ce557f6..5c6e91aefd 100644 --- a/src/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.csproj +++ b/src/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.csproj @@ -3,6 +3,7 @@ netstandard2.0 + Microsoft.ML.DnnImageFeaturizer.ResNet50 ML.NET component for pretrained ResNet50 image featurization diff --git a/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj b/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj index 288b0c818c..766107cd6b 100644 --- a/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj +++ b/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj @@ -3,6 +3,7 @@ netstandard2.0 + Microsoft.ML.Ensemble ML.NET component for Ensembles CORECLR diff --git a/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj b/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj index 33a05659e0..a2b946550c 100644 --- a/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj +++ b/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj @@ -3,6 +3,7 @@ netstandard2.0 + Microsoft.ML.EntryPoints Microsoft.ML.EntryPoints contains the ML.NET entry point API catalog. diff --git a/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj b/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj index e768c7298c..1996182a09 100644 --- a/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj +++ b/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj @@ -3,6 +3,7 @@ netstandard2.0 + Microsoft.ML.Experimental Microsoft.ML.Experimental contains experimental work such extension methods to access internal methods. diff --git a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj index 6832cdf22a..8b8ca3bcb6 100644 --- a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj +++ b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj @@ -3,6 +3,7 @@ netstandard2.0 + Microsoft.ML.FastTree ML.NET component for FastTree $(DefineConstants);USE_FASTTREENATIVE;NO_STORE;CORECLR true diff --git a/src/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.csproj b/src/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.csproj index 02eba201b6..c6069a3b51 100644 --- a/src/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.csproj +++ b/src/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.csproj @@ -3,6 +3,7 @@ netstandard2.0;netcoreapp2.1 + Microsoft.ML.Featurizers true ML.NET featurizers with native code implementation diff --git a/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj b/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj index ecb4944c8b..95acd84d01 100644 --- a/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj +++ b/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj @@ -3,6 +3,7 @@ netstandard2.0 + Microsoft.ML.ImageAnalytics ML.NET component for Image support diff --git a/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj b/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj index 45f6563c37..eea6944b85 100644 --- a/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj +++ b/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj @@ -3,6 +3,7 @@ netstandard2.0 + Microsoft.ML.LightGbm true ML.NET component for LightGBM diff --git a/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj b/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj index 6b92224b30..b69e11d586 100644 --- a/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj +++ b/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj @@ -3,6 +3,7 @@ netstandard2.0 + Microsoft.ML.Mkl.Components true ML.NET additional learners making use of Intel Mkl. diff --git a/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj b/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj index a8cdaa4b57..58c0ead6d5 100644 --- a/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj +++ b/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj @@ -3,6 +3,7 @@ netstandard2.0 + Microsoft.ML.OnnxConverter Microsoft.ML.Model.Onnx ML.NET component for exporting ONNX Models diff --git a/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj b/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj index b6f6bb84f2..8e344ac021 100644 --- a/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj +++ b/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj @@ -3,6 +3,7 @@ netstandard2.0 + Microsoft.ML.OnnxTransformer true ML.NET component for Microsoft.ML.Scoring library diff --git a/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj b/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj index 25a6c5342d..505e798783 100644 --- a/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj +++ b/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj @@ -3,6 +3,7 @@ netstandard2.0 + Microsoft.ML.Parquet ML.NET components for Apache Parquet support. diff --git a/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj b/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj index 55c1d0fb8e..0ad068fc7e 100644 --- a/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj +++ b/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj @@ -3,6 +3,7 @@ netstandard2.0 + Microsoft.ML.Recommender true LIBMF, the core computation library for matrix factorization in ML.NET diff --git a/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj b/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj index c33cb3441d..2e6ed18567 100644 --- a/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj +++ b/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj @@ -3,6 +3,7 @@ netstandard2.0 + Microsoft.ML.SampleUtils Sample utils for Microsoft.ML.Samples diff --git a/src/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.csproj b/src/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.csproj index 6b9c8a7f1d..13175f7042 100644 --- a/src/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.csproj +++ b/src/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.csproj @@ -3,6 +3,7 @@ netstandard2.0 + Microsoft.ML.TensorFlow CORECLR true Microsoft.ML.TensorFlow contains ML.NET integration of TensorFlow. diff --git a/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj b/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj index c06d000668..b5aa12d56a 100644 --- a/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj +++ b/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj @@ -3,6 +3,7 @@ netstandard2.0 + Microsoft.ML.TimeSeries Microsoft.ML.TimeSeries contains ML.NET Time Series prediction algorithms. Uses Intel Mkl. diff --git a/src/Microsoft.ML.Vision/Microsoft.ML.Vision.csproj b/src/Microsoft.ML.Vision/Microsoft.ML.Vision.csproj index 67d9285b42..08a74bc8d1 100644 --- a/src/Microsoft.ML.Vision/Microsoft.ML.Vision.csproj +++ b/src/Microsoft.ML.Vision/Microsoft.ML.Vision.csproj @@ -3,6 +3,7 @@ netstandard2.0 + Microsoft.ML.Vision CORECLR true Microsoft.ML.Vision contains high level APIs for vision tasks like image classification. From 3fcf127692d5fccab3670178fb36828ef96f22f1 Mon Sep 17 00:00:00 2001 From: Mustafa Bal <5262061+mstfbl@users.noreply.github.com> Date: Wed, 25 Nov 2020 15:20:55 -0800 Subject: [PATCH 2/3] Make .sh files executable --- eng/common/SetupNugetSources.sh | 0 eng/common/cibuild.sh | 0 eng/common/cross/arm64/tizen-build-rootfs.sh | 0 eng/common/cross/arm64/tizen-fetch.sh | 0 eng/common/cross/armel/tizen-build-rootfs.sh | 0 eng/common/cross/armel/tizen-fetch.sh | 0 eng/common/cross/build-android-rootfs.sh | 0 eng/common/cross/build-rootfs.sh | 0 eng/common/darc-init.sh | 0 eng/common/dotnet-install-scripts/dotnet-install.sh | 0 eng/common/init-tools-native.sh | 0 eng/common/internal-feed-operations.sh | 0 eng/common/msbuild.sh | 0 eng/common/native/common-library.sh | 0 eng/common/native/find-native-compiler.sh | 0 eng/common/native/install-cmake-test.sh | 0 eng/common/native/install-cmake.sh | 0 eng/common/performance/performance-setup.sh | 0 eng/common/pipeline-logging-functions.sh | 0 eng/common/tools.sh | 0 restore.sh | 0 21 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 eng/common/SetupNugetSources.sh mode change 100644 => 100755 eng/common/cibuild.sh mode change 100644 => 100755 eng/common/cross/arm64/tizen-build-rootfs.sh mode change 100644 => 100755 eng/common/cross/arm64/tizen-fetch.sh mode change 100644 => 100755 eng/common/cross/armel/tizen-build-rootfs.sh mode change 100644 => 100755 eng/common/cross/armel/tizen-fetch.sh mode change 100644 => 100755 eng/common/cross/build-android-rootfs.sh mode change 100644 => 100755 eng/common/cross/build-rootfs.sh mode change 100644 => 100755 eng/common/darc-init.sh mode change 100644 => 100755 eng/common/dotnet-install-scripts/dotnet-install.sh mode change 100644 => 100755 eng/common/init-tools-native.sh mode change 100644 => 100755 eng/common/internal-feed-operations.sh mode change 100644 => 100755 eng/common/msbuild.sh mode change 100644 => 100755 eng/common/native/common-library.sh mode change 100644 => 100755 eng/common/native/find-native-compiler.sh mode change 100644 => 100755 eng/common/native/install-cmake-test.sh mode change 100644 => 100755 eng/common/native/install-cmake.sh mode change 100644 => 100755 eng/common/performance/performance-setup.sh mode change 100644 => 100755 eng/common/pipeline-logging-functions.sh mode change 100644 => 100755 eng/common/tools.sh mode change 100644 => 100755 restore.sh diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh old mode 100644 new mode 100755 diff --git a/eng/common/cibuild.sh b/eng/common/cibuild.sh old mode 100644 new mode 100755 diff --git a/eng/common/cross/arm64/tizen-build-rootfs.sh b/eng/common/cross/arm64/tizen-build-rootfs.sh old mode 100644 new mode 100755 diff --git a/eng/common/cross/arm64/tizen-fetch.sh b/eng/common/cross/arm64/tizen-fetch.sh old mode 100644 new mode 100755 diff --git a/eng/common/cross/armel/tizen-build-rootfs.sh b/eng/common/cross/armel/tizen-build-rootfs.sh old mode 100644 new mode 100755 diff --git a/eng/common/cross/armel/tizen-fetch.sh b/eng/common/cross/armel/tizen-fetch.sh old mode 100644 new mode 100755 diff --git a/eng/common/cross/build-android-rootfs.sh b/eng/common/cross/build-android-rootfs.sh old mode 100644 new mode 100755 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh old mode 100644 new mode 100755 diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh old mode 100644 new mode 100755 diff --git a/eng/common/dotnet-install-scripts/dotnet-install.sh b/eng/common/dotnet-install-scripts/dotnet-install.sh old mode 100644 new mode 100755 diff --git a/eng/common/init-tools-native.sh b/eng/common/init-tools-native.sh old mode 100644 new mode 100755 diff --git a/eng/common/internal-feed-operations.sh b/eng/common/internal-feed-operations.sh old mode 100644 new mode 100755 diff --git a/eng/common/msbuild.sh b/eng/common/msbuild.sh old mode 100644 new mode 100755 diff --git a/eng/common/native/common-library.sh b/eng/common/native/common-library.sh old mode 100644 new mode 100755 diff --git a/eng/common/native/find-native-compiler.sh b/eng/common/native/find-native-compiler.sh old mode 100644 new mode 100755 diff --git a/eng/common/native/install-cmake-test.sh b/eng/common/native/install-cmake-test.sh old mode 100644 new mode 100755 diff --git a/eng/common/native/install-cmake.sh b/eng/common/native/install-cmake.sh old mode 100644 new mode 100755 diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh old mode 100644 new mode 100755 diff --git a/eng/common/pipeline-logging-functions.sh b/eng/common/pipeline-logging-functions.sh old mode 100644 new mode 100755 diff --git a/eng/common/tools.sh b/eng/common/tools.sh old mode 100644 new mode 100755 diff --git a/restore.sh b/restore.sh old mode 100644 new mode 100755 From 904658458d131454a80740a0d0543a98c15c0d7d Mon Sep 17 00:00:00 2001 From: Frank Dong Date: Mon, 30 Nov 2020 23:32:06 +0000 Subject: [PATCH 3/3] fix mkl nuget issue --- .../Microsoft.ML.Mkl.Components.csproj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj b/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj index b69e11d586..1f931abe55 100644 --- a/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj +++ b/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj @@ -31,7 +31,9 @@ - + + all +