Skip to content

Commit 1ba081c

Browse files
artidoroartidoro
committed
review comments
1 parent 4e93cf3 commit 1ba081c

File tree

13 files changed

+51
-51
lines changed

13 files changed

+51
-51
lines changed

‎Directory.Build.props

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,4 @@
124124
<PropertyGroup>
125125
<CustomAfterMicrosoftCommonTargets>$(RepoRoot)build\AfterCommonTargets.targets</CustomAfterMicrosoftCommonTargets>
126126
</PropertyGroup>
127-
128-
<!-- API Compat -->
129-
<PropertyGroup>
130-
<!-- only validate that the current implementation is compatible
131-
with the old one, not vice-versa (since latest may have new
132-
API missing from old) -->
133-
<RunApiCompatForSrc>true</RunApiCompatForSrc>
134-
<RunMatchingRefApiCompat>false</RunMatchingRefApiCompat>
135-
</PropertyGroup>
136127
</Project>

‎Microsoft.ML.sln

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 15
3-
VisualStudioVersion = 15.0.27130.2026
2+
# Visual Studio Version 16
3+
VisualStudioVersion = 16.0.28803.352
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Core", "src\Microsoft.ML.Core\Microsoft.ML.Core.csproj", "{A6CA6CC6-5D7C-4D7F-A0F5-35E14B383B0A}"
66
EndProject
@@ -274,7 +274,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.FastTree", "Mi
274274
pkg\Microsoft.ML.FastTree\Microsoft.ML.FastTree.symbols.nupkgproj = pkg\Microsoft.ML.FastTree\Microsoft.ML.FastTree.symbols.nupkgproj
275275
EndProjectSection
276276
EndProject
277-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.StableApi", "tools-local\Microsoft.ML.StableApi\Microsoft.ML.StableApi.csproj", "{C1884169-7330-42DF-B401-9427C6EFB092}"
277+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.StableApi", "tools-local\Microsoft.ML.StableApi\Microsoft.ML.StableApi.csproj", "{F308DC6B-7E59-40D7-A581-834E8CD99CFE}"
278278
EndProject
279279
Global
280280
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -970,17 +970,18 @@ Global
970970
{E02DA82D-3FEE-4C60-BD80-9EC3C3448DFC}.Release-Intrinsics|Any CPU.Build.0 = Release-Intrinsics|Any CPU
971971
{E02DA82D-3FEE-4C60-BD80-9EC3C3448DFC}.Release-netfx|Any CPU.ActiveCfg = Release-netfx|Any CPU
972972
{E02DA82D-3FEE-4C60-BD80-9EC3C3448DFC}.Release-netfx|Any CPU.Build.0 = Release-netfx|Any CPU
973-
{C1884169-7330-42DF-B401-9427C6EFB092}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
974-
{C1884169-7330-42DF-B401-9427C6EFB092}.Debug-Intrinsics|Any CPU.ActiveCfg = Debug-Intrinsics|Any CPU
975-
{C1884169-7330-42DF-B401-9427C6EFB092}.Debug-Intrinsics|Any CPU.Build.0 = Debug-Intrinsics|Any CPU
976-
{C1884169-7330-42DF-B401-9427C6EFB092}.Debug-netfx|Any CPU.ActiveCfg = Debug-netfx|Any CPU
977-
{C1884169-7330-42DF-B401-9427C6EFB092}.Debug-netfx|Any CPU.Build.0 = Debug-netfx|Any CPU
978-
{C1884169-7330-42DF-B401-9427C6EFB092}.Release|Any CPU.ActiveCfg = Release|Any CPU
979-
{C1884169-7330-42DF-B401-9427C6EFB092}.Release|Any CPU.Build.0 = Release|Any CPU
980-
{C1884169-7330-42DF-B401-9427C6EFB092}.Release-Intrinsics|Any CPU.ActiveCfg = Release-Intrinsics|Any CPU
981-
{C1884169-7330-42DF-B401-9427C6EFB092}.Release-Intrinsics|Any CPU.Build.0 = Release-Intrinsics|Any CPU
982-
{C1884169-7330-42DF-B401-9427C6EFB092}.Release-netfx|Any CPU.ActiveCfg = Release-netfx|Any CPU
983-
{C1884169-7330-42DF-B401-9427C6EFB092}.Release-netfx|Any CPU.Build.0 = Release-netfx|Any CPU
973+
{F308DC6B-7E59-40D7-A581-834E8CD99CFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
974+
{F308DC6B-7E59-40D7-A581-834E8CD99CFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
975+
{F308DC6B-7E59-40D7-A581-834E8CD99CFE}.Debug-Intrinsics|Any CPU.ActiveCfg = Debug-Intrinsics|Any CPU
976+
{F308DC6B-7E59-40D7-A581-834E8CD99CFE}.Debug-Intrinsics|Any CPU.Build.0 = Debug-Intrinsics|Any CPU
977+
{F308DC6B-7E59-40D7-A581-834E8CD99CFE}.Debug-netfx|Any CPU.ActiveCfg = Debug-netfx|Any CPU
978+
{F308DC6B-7E59-40D7-A581-834E8CD99CFE}.Debug-netfx|Any CPU.Build.0 = Debug-netfx|Any CPU
979+
{F308DC6B-7E59-40D7-A581-834E8CD99CFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
980+
{F308DC6B-7E59-40D7-A581-834E8CD99CFE}.Release|Any CPU.Build.0 = Release|Any CPU
981+
{F308DC6B-7E59-40D7-A581-834E8CD99CFE}.Release-Intrinsics|Any CPU.ActiveCfg = Release-Intrinsics|Any CPU
982+
{F308DC6B-7E59-40D7-A581-834E8CD99CFE}.Release-Intrinsics|Any CPU.Build.0 = Release-Intrinsics|Any CPU
983+
{F308DC6B-7E59-40D7-A581-834E8CD99CFE}.Release-netfx|Any CPU.ActiveCfg = Release-netfx|Any CPU
984+
{F308DC6B-7E59-40D7-A581-834E8CD99CFE}.Release-netfx|Any CPU.Build.0 = Release-netfx|Any CPU
984985
EndGlobalSection
985986
GlobalSection(SolutionProperties) = preSolution
986987
HideSolutionNode = FALSE
@@ -1068,7 +1069,7 @@ Global
10681069
{AD7058C9-5608-49A8-BE23-58C33A74EE91} = {D3D38B03-B557-484D-8348-8BADEE4DF592}
10691070
{E02DA82D-3FEE-4C60-BD80-9EC3C3448DFC} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
10701071
{B1B3F284-FA3D-4D76-A712-FF04495D244B} = {D3D38B03-B557-484D-8348-8BADEE4DF592}
1071-
{C1884169-7330-42DF-B401-9427C6EFB092} = {7F13E156-3EBA-4021-84A5-CD56BA72F99E}
1072+
{F308DC6B-7E59-40D7-A581-834E8CD99CFE} = {7F13E156-3EBA-4021-84A5-CD56BA72F99E}
10721073
EndGlobalSection
10731074
GlobalSection(ExtensibilityGlobals) = postSolution
10741075
SolutionGuid = {41165AF1-35BB-4832-A189-73060F82B01D}

‎src/Directory.Build.props

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,19 @@
1919
<PackageRid Condition="'$(OS)' != 'Windows_NT'">linux</PackageRid>
2020
<PackageRid Condition="$([MSBuild]::IsOSPlatform('osx'))">osx</PackageRid>
2121
<PackageRid>$(PackageRid)-$(TargetArchitecture)</PackageRid>
22+
</PropertyGroup>
2223

24+
<!-- API Compat -->
25+
<PropertyGroup>
2326
<RunApiCompat Condition="'$(RunApiCompat)' == ''">$(IsStableProject)</RunApiCompat>
24-
</PropertyGroup>
2527

28+
<!-- only validate that the current implementation is compatible
29+
with the old one, not vice-versa (since latest may have new
30+
API missing from old) -->
31+
<RunApiCompatForSrc>true</RunApiCompatForSrc>
32+
<RunMatchingRefApiCompat>false</RunMatchingRefApiCompat>
33+
</PropertyGroup>
34+
2635
<ItemGroup>
2736
<ProjectReference
2837
Condition="'$(UseMLCodeAnalyzer)' != 'false' and '$(MSBuildProjectExtension)' == '.csproj'"
@@ -39,5 +48,4 @@
3948
<Link>stylecop.json</Link>
4049
</AdditionalFiles>
4150
</ItemGroup>
42-
4351
</Project>

‎src/Directory.Build.targets

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,25 @@
3333
$(ResolveReferencesDependsOn);
3434
ResolveMatchingContract
3535
</ResolveReferencesDependsOn>
36-
36+
3737
<StableApiProject>$(RepoRoot)tools-local\Microsoft.ML.StableApi\Microsoft.ML.StableApi.csproj</StableApiProject>
3838
</PropertyGroup>
3939

4040
<ItemGroup Condition="'$(RunApiCompat)' == 'true'">
41-
<PackageReference Include="Microsoft.DotNet.ApiCompat"
42-
Version="$(MicrosoftDotNetApiCompatPackageVersion)"
41+
<PackageReference Include="Microsoft.DotNet.ApiCompat"
42+
Version="$(MicrosoftDotNetApiCompatPackageVersion)"
4343
PrivateAssets="All" />
4444
</ItemGroup>
45-
45+
4646
<Target Name="ResolveMatchingContract">
4747
<MSBuild Projects="$(StableApiProject)"
4848
Targets="GetContract"
4949
Properties="ContractName=$(AssemblyName);TargetFramework=$(TargetFramework)">
5050
<Output TaskParameter="TargetOutputs" ItemName="ResolvedMatchingContract"/>
5151
</MSBuild>
52+
<PropertyGroup>
53+
<ContractOutputPath>%(ResolvedMatchingContract.DependencyPaths)</ContractOutputPath>
54+
</PropertyGroup>
5255
</Target>
5356

5457
</Project>

‎src/Microsoft.ML.Analyzer/Microsoft.ML.Analyzer.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
<PropertyGroup>
44
<TargetFramework>netstandard1.3</TargetFramework>
55
<IncludeAnalyzerInPackage>Microsoft.ML</IncludeAnalyzerInPackage>
6-
7-
<!-- No public surface in this assembly -->
8-
<RunApiCompat>false</RunApiCompat>
96
</PropertyGroup>
107

118
<ItemGroup>

‎src/Microsoft.ML.Core/Microsoft.ML.Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<ItemGroup>
1212
<ProjectReference Include="..\Microsoft.ML.DataView\Microsoft.ML.DataView.csproj" />
13-
13+
1414
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
1515
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
1616
</ItemGroup>

‎src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
<ItemGroup>
1414
<Compile Include="..\Microsoft.ML.Core\Utilities\ArrayUtils.cs" />
1515
</ItemGroup>
16-
16+
1717
</Project>

‎src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
<ProjectReference Include="..\Microsoft.ML.CpuMath\Microsoft.ML.CpuMath.csproj" />
1313
<ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
1414
</ItemGroup>
15-
15+
1616
</Project>

‎src/Microsoft.ML.KMeansClustering/Microsoft.ML.KMeansClustering.csproj

Lines changed: 1 addition & 1 deletion
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

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>

‎src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<IncludeInPackage>Microsoft.ML.LightGbm</IncludeInPackage>
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
77
</PropertyGroup>
8-
8+
99
<ItemGroup>
1010
<ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
1111
<ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />

‎src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<IncludeInPackage>Microsoft.ML.Mkl.Components</IncludeInPackage>
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
77
</PropertyGroup>
8-
8+
99
<ItemGroup>
1010
<ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
1111
<ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />

‎src/Microsoft.ML.PCA/Microsoft.ML.PCA.csproj

Lines changed: 1 addition & 1 deletion
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

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>

‎tools-local/Microsoft.ML.StableApi/Microsoft.ML.StableApi.csproj

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.ML" Version="1.0.0-preview-27630-5"/>
10-
<PackageReference Include="Microsoft.ML.DataView" Version="1.0.0-preview-27630-5"/>
11-
<PackageReference Include="Microsoft.ML.CpuMath" Version="1.0.0-preview-27630-5"/>
12-
<PackageReference Include="Microsoft.ML.FastTree" Version="1.0.0-preview-27630-5"/>
13-
<PackageReference Include="Microsoft.ML.LightGbm" Version="1.0.0-preview-27630-5"/>
14-
<PackageReference Include="Microsoft.ML.ImageAnalytics" Version="1.0.0-preview-27630-5"/>
15-
<PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.0.0-preview-27630-5"/>
16-
<PackageReference Include="Microsoft.ML.Mkl.Redist" Version="1.0.0-preview-27630-5"/>
9+
<PackageReference Include="Microsoft.ML" Version="1.0.0" />
10+
<PackageReference Include="Microsoft.ML.DataView" Version="1.0.0" />
11+
<PackageReference Include="Microsoft.ML.CpuMath" Version="1.0.0" />
12+
<PackageReference Include="Microsoft.ML.FastTree" Version="1.0.0" />
13+
<PackageReference Include="Microsoft.ML.LightGbm" Version="1.0.0" />
14+
<PackageReference Include="Microsoft.ML.ImageAnalytics" Version="1.0.0" />
15+
<PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.0.0" />
1716
</ItemGroup>
1817

1918
<!-- The purpose of this target is to return a path from a referenced
2019
package / project -->
21-
<Target Name="GetContract"
22-
DependsOnTargets="ResolveReferences"
23-
Returns="@(_contractReferencePath)">
20+
<Target Name="GetContract" DependsOnTargets="ResolveReferences" Returns="@(_contractReferencePath)">
2421
<Error Condition="'$(ContractName)' == ''" Text="ContractName must be specified" />
2522
<ItemGroup>
2623
<_contractReferencePath Include="@(ReferencePath)" Condition="'%(FileName)' == '$(ContractName)'" />
24+
<_allReferenceDirectories Include="%(ReferencePath.RootDir)%(ReferencePath.Directory)" />
25+
<_contractReferencePath Include="@(ReferencePath)" Condition="'%(FileName)' == '$(ContractName)'" />
26+
<_contractReferencePath DependencyPaths="@(_allReferenceDirectories)" />
2727
</ItemGroup>
2828
<Error Condition="'@(_contractReferencePath)' == ''" Text="Could not locate $(ContractName)" />
2929
</Target>

0 commit comments

Comments
 (0)