-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
The
-test command for windows. Nuget packages (#5464)
* working on testing * testing updates * tests almost working * build changes * all tests should be working * changes from PR comments * fixes for .net 3.1 * Fixed extension check. Removed <PackageId> where not needed * Removed pkg folder and updated paths.
- Loading branch information
1 parent
3d0a760
commit acd873f
Showing
106 changed files
with
591 additions
and
732 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,39 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project> | ||
| <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" /> | ||
|
|
||
| <Target Name="CopyNativeAssembiles" AfterTargets="CopyFilesToOutputDirectory"> | ||
| <PropertyGroup> | ||
| <LibPrefix Condition="'$(OS)' != 'Windows_NT'">lib</LibPrefix> | ||
| <LibExtension Condition="'$(OS)' == 'Windows_NT'">.dll</LibExtension> | ||
| <LibExtension Condition="'$(OS)' != 'Windows_NT'">.so</LibExtension> | ||
| <LibExtension Condition="$([MSBuild]::IsOSPlatform('osx'))">.dylib</LibExtension> | ||
|
|
||
| <TargetArchitecture Condition="'$(Platform)' == ''">x64</TargetArchitecture> | ||
| <NativeTargetArchitecture Condition="'$(NativeTargetArchitecture)' == ''">$(TargetArchitecture)</NativeTargetArchitecture> | ||
| <BinDir Condition="'$(BinDir)'==''">$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin'))</BinDir> | ||
| <NativeOutputPath>$(BinDir)Native\$(NativeTargetArchitecture).$(Configuration)\</NativeOutputPath> | ||
|
|
||
| <Platform Condition="'$(Platform)'==''">AnyCPU</Platform> | ||
| <PlatformConfig>$(Platform).$(Configuration)</PlatformConfig> | ||
| <OutputPath Condition="'$(OutputPath)'==''">$(BinDir)$(MSBuildProjectName)\Debug</OutputPath> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <NativeAssemblyReference> | ||
| <FullAssemblyPath>$(NativeOutputPath)$(LibPrefix)%(NativeAssemblyReference.Identity)$(LibExtension)</FullAssemblyPath> | ||
| </NativeAssemblyReference> | ||
| </ItemGroup> | ||
|
|
||
| <Copy SourceFiles = "@(NativeAssemblyReference->'%(FullAssemblyPath)')" | ||
| DestinationFolder="$(OutDir)" | ||
| OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)" | ||
| Retries="$(CopyRetryCount)" | ||
| RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)" | ||
| UseHardlinksIfPossible="$(CreateHardLinksForPublishFilesIfPossible)" | ||
| UseSymboliclinksIfPossible="$(CreateSymbolicLinksForPublishFilesIfPossible)"> | ||
| <Output TaskParameter="DestinationFiles" ItemName="FileWrites"/> | ||
| </Copy> | ||
| </Target> | ||
|
|
||
| </Project> |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,17 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project> | ||
|
|
||
| <ItemDefinitionGroup> | ||
| <ProjectToBuild> | ||
| <RestoreInParallel>true</RestoreInParallel> | ||
| <BuildInParallel>false</BuildInParallel> | ||
| </ProjectToBuild> | ||
| </ItemDefinitionGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectToBuild Include="$(RepoRoot)src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj" /> | ||
| <ProjectToBuild Include="$(RepoRoot)src/Native/Native.proj" /> | ||
| <ProjectToBuild Include="$(RepoRoot)Microsoft.ML.sln" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| <Project> | ||
|
|
||
| <PropertyGroup> | ||
| <PackageAssetsPath>$(ArtifactsDir)pkgassets/</PackageAssetsPath> | ||
| <IncludeSymbols>true</IncludeSymbols> | ||
| <SymbolPackageFormat>snupkg</SymbolPackageFormat> | ||
| <IsSymbolsPackage Condition="$(MSBuildProjectName.Contains('.snupkg'))">true</IsSymbolsPackage> | ||
| <PackageIdFolderName>$(MSBuildProjectName.Replace('.symbols', ''))</PackageIdFolderName> | ||
| <IncludeBuildOutput>true</IncludeBuildOutput> | ||
| <IsPackable>true</IsPackable> | ||
|
|
||
| </PropertyGroup> | ||
|
|
||
| <!-- nuspec properties --> | ||
| <PropertyGroup> | ||
| <Authors>Microsoft</Authors> | ||
| <PackageLicenseFile>LICENSE</PackageLicenseFile> | ||
| <PackageProjectUrl>https://dot.net/ml</PackageProjectUrl> | ||
| <PackageIcon>mlnetlogo.png</PackageIcon> | ||
| <PackageReleaseNotes>https://aka.ms/mlnetreleasenotes</PackageReleaseNotes> | ||
| <!-- space separated --> | ||
| <PackageTags>ML.NET ML Machine Learning</PackageTags> | ||
|
|
||
| <LibExtension Condition="'$(OS)' == 'Windows_NT'">.dll</LibExtension> | ||
| <LibExtension Condition="'$(OS)' != 'Windows_NT'">.so</LibExtension> | ||
| <LibExtension Condition="$([MSBuild]::IsOSPlatform('osx'))">.dylib</LibExtension> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
|
|
||
| <!-- Create symbol packages correctly by copying the library and xml to the nuget. Then the pdb is auto put in the symbols package--> | ||
| <Content Include="$(PackageAssetsPath)$(PackageIdFolderName)\lib\**\*" PackagePath="lib" /> | ||
| <Content Include="$(PackageAssetsPath)$(PackageIdFolderName)\analyzers\**\*" PackagePath="analyzers" /> | ||
| <Content Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\**\*" PackagePath="runtimes" /> | ||
| <Content Include="$(PackageAssetsPath)$(PackageIdFolderName)\tools\**\*" PackagePath="tools" /> | ||
|
|
||
| <Content Include="$(RepoRoot)eng\pkg\mlnetlogo.png" Pack="true" PackagePath="" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup Condition="'$(IncludeMLNetNotices)' != 'false'"> | ||
| <Content Include="$(RepoRoot)\THIRD-PARTY-NOTICES.TXT" Pack="true" PackagePath="" /> | ||
| <Content Include="$(RepoRoot)\LICENSE" Pack="true" PackagePath=""/> | ||
| </ItemGroup> | ||
|
|
||
| <!-- This check does not work corectly anymore and also removes the PDB from the symbols packages. | ||
| Need to figure out the correct way to do this, but since the normal packages are building correctly | ||
| I am leaving this as is for now. --> | ||
| <ItemGroup Condition="'$(IsSymbolsPackage)' != 'true'"> | ||
| <Content Remove="$(PackageAssetsPath)$(PackageIdFolderName)\**\*.pdb" /> | ||
| <Content Remove="$(PackageAssetsPath)$(PackageIdFolderName)\**\*.dwarf" /> | ||
| <Content Remove="$(PackageAssetsPath)$(PackageIdFolderName)\**\*.dbg" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup Condition="Exists('packages.config') OR | ||
| Exists('$(MSBuildProjectName).packages.config') OR | ||
| Exists('packages.$(MSBuildProjectName).config')"> | ||
| <Content Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x64\native\*.dll" | ||
| Condition="'$(PlatformTarget)' == 'x64'"> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| <Visible>false</Visible> | ||
| <Link>%(Filename)%(Extension)</Link> | ||
| </Content> | ||
| <Content Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\*.dll" | ||
| Condition="'$(PlatformTarget)' == 'x86'"> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| <Visible>false</Visible> | ||
| <Link>%(Filename)%(Extension)</Link> | ||
| </Content> | ||
| </ItemGroup> | ||
|
|
||
| <!-- Work around https://github.com/NuGet/Home/issues/6091 --> | ||
| <ItemDefinitionGroup> | ||
| <PackageReference> | ||
| <PrivateAssets>None</PrivateAssets> | ||
| </PackageReference> | ||
| </ItemDefinitionGroup> | ||
|
|
||
| </Project> |
File renamed without changes.
File renamed without changes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,15 @@ | ||
| { | ||
| "tools": { | ||
| "dotnet": "5.0.100-rc.1.20452.10" | ||
| }, | ||
| "msbuild-sdks": { | ||
| "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20461.7", | ||
| "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20461.7", | ||
| "Microsoft.Build.Traversal": "2.1.1", | ||
| "Microsoft.SourceLink.GitHub": "1.1.0-beta-20206-02", | ||
| "Microsoft.SourceLink.Common": "1.1.0-beta-20206-02" | ||
| "tools": { | ||
| "dotnet": "5.0.100-rc.1.20452.10", | ||
| "runtimes": { | ||
| "dotnet/x64": ["$(MicrosoftNETCorePlatformsVersion)", "$(MicrosoftNETCore3PlatformsVersion)" ] | ||
| } | ||
| }, | ||
| "msbuild-sdks": { | ||
| "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20461.7", | ||
| "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20461.7", | ||
| "Microsoft.Build.Traversal": "2.1.1", | ||
| "Microsoft.SourceLink.GitHub": "1.1.0-beta-20206-02", | ||
| "Microsoft.SourceLink.Common": "1.1.0-beta-20206-02" | ||
| } | ||
| } | ||
| } |
This file was deleted.
Oops, something went wrong.
16 changes: 0 additions & 16 deletions
16
pkg/Microsoft.Extensions.ML/Microsoft.Extensions.ML.nupkgproj
This file was deleted.
Oops, something went wrong.
5 changes: 0 additions & 5 deletions
5
pkg/Microsoft.Extensions.ML/Microsoft.Extensions.ML.symbols.nupkgproj
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
3 changes: 0 additions & 3 deletions
3
pkg/Microsoft.ML.AutoML/Microsoft.ML.AutoML.symbols.nupkgproj
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.