Skip to content

Commit 2990008

Browse files
harishskharishsk
authored
Minor clean up of v1.4 solution (dotnet#867)
* Minor clean up of v1.4 solution * Cleaned up and consolidated solutions * Updated samples to use v1.5.4 and updated dependencies in build pipeline
1 parent a5ef0ec commit 2990008

File tree

17 files changed

+36
-260
lines changed

17 files changed

+36
-260
lines changed

‎.vsts-dotnet-ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,9 @@ phases:
164164
queue: Hosted VS2017
165165
steps:
166166
- task: UseDotNet@2
167-
displayName: 'Use .NET Core 3.0'
167+
displayName: 'Use .NET Core 3.1'
168168
inputs:
169-
version: 3.0.x
169+
version: 3.1.x
170170
includePreviewVersions: true
171171
installationPath: $(Agent.ToolsDirectory)/dotnet
172172
- task: DotNetCoreCLI@2
@@ -194,9 +194,9 @@ phases:
194194
queue: Hosted VS2017
195195
steps:
196196
- task: UseDotNet@2
197-
displayName: 'Use .NET Core 3.0'
197+
displayName: 'Use .NET Core 3.1'
198198
inputs:
199-
version: 3.0.x
199+
version: 3.1.x
200200
includePreviewVersions: true
201201
installationPath: $(Agent.ToolsDirectory)/dotnet
202202
- task: DotNetCoreCLI@2

‎samples/Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project>
22

33
<PropertyGroup>
4-
<MicrosoftMLVersion>1.5.3</MicrosoftMLVersion>
5-
<MicrosoftMLPreviewVersion>0.17.3</MicrosoftMLPreviewVersion>
4+
<MicrosoftMLVersion>1.5.4</MicrosoftMLVersion>
5+
<MicrosoftMLPreviewVersion>0.17.4</MicrosoftMLPreviewVersion>
66
</PropertyGroup>
77

88
</Project>

‎samples/csharp/v1.4-All-Samples.sln renamed to ‎samples/csharp/All-Samples.sln

Lines changed: 20 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SpikeDetection.Solution", "
2929
EndProject
3030
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PowerAnomalyDetection.Solution", "PowerAnomalyDetection.Solution", "{417CA47F-36DE-4F6E-B53D-330D2B373ECF}"
3131
EndProject
32-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreditCardFraudDetection.Common", "getting-started\BinaryClassification_CreditCardFraudDetection\CreditCardFraudDetection.Common\CreditCardFraudDetection.Common.csproj", "{8FB158D4-737F-4C15-8650-A6F85810062D}"
33-
EndProject
34-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreditCardFraudDetection.Predictor", "getting-started\BinaryClassification_CreditCardFraudDetection\CreditCardFraudDetection.Predictor\CreditCardFraudDetection.Predictor.csproj", "{074A3366-670D-4ADD-9487-598935CCDC26}"
35-
EndProject
36-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreditCardFraudDetection.Trainer", "getting-started\BinaryClassification_CreditCardFraudDetection\CreditCardFraudDetection.Trainer\CreditCardFraudDetection.Trainer.csproj", "{27B9333A-51F9-4A55-A4AB-733E6C04FBEC}"
37-
EndProject
3832
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomerSegmentation.Train", "getting-started\Clustering_CustomerSegmentation\CustomerSegmentation.Train\CustomerSegmentation.Train.csproj", "{03D6F4A5-AFE7-4C9C-AAF8-5EBE68E4F9D8}"
3933
EndProject
4034
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomerSegmentation.Predict", "getting-started\Clustering_CustomerSegmentation\CustomerSegmentation.Predict\CustomerSegmentation.Predict.csproj", "{877A1BC6-6FCF-411C-AEC9-64E8CF92E636}"
@@ -105,8 +99,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LargeDatasets", "getting-st
10599
EndProject
106100
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TFImageClassififcationE2E.Solution", "TFImageClassififcationE2E.Solution", "{F59681C2-D829-4538-A41A-568F7A7D07FD}"
107101
EndProject
108-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TensorFlowImageClassification", "end-to-end-apps\DeepLearning_ImageClassification_TensorFlow\TensorFlowImageClassification\TensorFlowImageClassification.csproj", "{C5D5BEBF-DC10-4065-A27B-AB56E1ABCA47}"
109-
EndProject
110102
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebRanking.Solution", "WebRanking.Solution", "{B76DD928-A78E-497C-BA7D-83C5864452F9}"
111103
EndProject
112104
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebRanking", "getting-started\Ranking_Web\WebRanking\WebRanking.csproj", "{4EA790BB-76C7-471A-ADE4-6FBD183C461B}"
@@ -163,9 +155,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ImageBinaryClassificationMo
163155
EndProject
164156
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BlazorSentimentAnalysis.Solution", "BlazorSentimentAnalysis.Solution", "{2758A82A-66D7-4831-96AC-F70E45965D3B}"
165157
EndProject
166-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorSentimentAnalysis.Server", "end-to-end-apps\ScalableSentimentAnalysisBlazorWebApp\BlazorSentimentAnalysis.Server\BlazorSentimentAnalysis.Server.csproj", "{A4C3C76E-8FE2-42D0-9353-BAD1F68A777C}"
158+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorSentiment.Client", "end-to-end-apps\ScalableSentimentAnalysisBlazorWebApp\BlazorSentiment.Client\BlazorSentiment.Client.csproj", "{FBDA9AAB-C725-4F63-AA27-76C937A1EED4}"
167159
EndProject
168-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorSentimentAnalysis.Client", "end-to-end-apps\ScalableSentimentAnalysisBlazorWebApp\BlazorSentimentAnalysis.Client\BlazorSentimentAnalysis.Client.csproj", "{5F44B7D0-36C5-49FF-B81F-D8F70E2AE21B}"
160+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorSentiment.Server", "end-to-end-apps\ScalableSentimentAnalysisBlazorWebApp\BlazorSentiment.Server\BlazorSentiment.Server.csproj", "{329C7A29-90FF-427A-B676-1E32F9C7E9ED}"
169161
EndProject
170162
Global
171163
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -183,30 +175,6 @@ Global
183175
{6E091170-BA63-4DF3-9C71-62DA2157ABB2}.Release|Any CPU.Build.0 = Release|Any CPU
184176
{6E091170-BA63-4DF3-9C71-62DA2157ABB2}.Release|x64.ActiveCfg = Release|Any CPU
185177
{6E091170-BA63-4DF3-9C71-62DA2157ABB2}.Release|x64.Build.0 = Release|Any CPU
186-
{8FB158D4-737F-4C15-8650-A6F85810062D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
187-
{8FB158D4-737F-4C15-8650-A6F85810062D}.Debug|Any CPU.Build.0 = Debug|Any CPU
188-
{8FB158D4-737F-4C15-8650-A6F85810062D}.Debug|x64.ActiveCfg = Debug|Any CPU
189-
{8FB158D4-737F-4C15-8650-A6F85810062D}.Debug|x64.Build.0 = Debug|Any CPU
190-
{8FB158D4-737F-4C15-8650-A6F85810062D}.Release|Any CPU.ActiveCfg = Release|Any CPU
191-
{8FB158D4-737F-4C15-8650-A6F85810062D}.Release|Any CPU.Build.0 = Release|Any CPU
192-
{8FB158D4-737F-4C15-8650-A6F85810062D}.Release|x64.ActiveCfg = Release|Any CPU
193-
{8FB158D4-737F-4C15-8650-A6F85810062D}.Release|x64.Build.0 = Release|Any CPU
194-
{074A3366-670D-4ADD-9487-598935CCDC26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
195-
{074A3366-670D-4ADD-9487-598935CCDC26}.Debug|Any CPU.Build.0 = Debug|Any CPU
196-
{074A3366-670D-4ADD-9487-598935CCDC26}.Debug|x64.ActiveCfg = Debug|Any CPU
197-
{074A3366-670D-4ADD-9487-598935CCDC26}.Debug|x64.Build.0 = Debug|Any CPU
198-
{074A3366-670D-4ADD-9487-598935CCDC26}.Release|Any CPU.ActiveCfg = Release|Any CPU
199-
{074A3366-670D-4ADD-9487-598935CCDC26}.Release|Any CPU.Build.0 = Release|Any CPU
200-
{074A3366-670D-4ADD-9487-598935CCDC26}.Release|x64.ActiveCfg = Release|Any CPU
201-
{074A3366-670D-4ADD-9487-598935CCDC26}.Release|x64.Build.0 = Release|Any CPU
202-
{27B9333A-51F9-4A55-A4AB-733E6C04FBEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
203-
{27B9333A-51F9-4A55-A4AB-733E6C04FBEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
204-
{27B9333A-51F9-4A55-A4AB-733E6C04FBEC}.Debug|x64.ActiveCfg = Debug|Any CPU
205-
{27B9333A-51F9-4A55-A4AB-733E6C04FBEC}.Debug|x64.Build.0 = Debug|Any CPU
206-
{27B9333A-51F9-4A55-A4AB-733E6C04FBEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
207-
{27B9333A-51F9-4A55-A4AB-733E6C04FBEC}.Release|Any CPU.Build.0 = Release|Any CPU
208-
{27B9333A-51F9-4A55-A4AB-733E6C04FBEC}.Release|x64.ActiveCfg = Release|Any CPU
209-
{27B9333A-51F9-4A55-A4AB-733E6C04FBEC}.Release|x64.Build.0 = Release|Any CPU
210178
{03D6F4A5-AFE7-4C9C-AAF8-5EBE68E4F9D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
211179
{03D6F4A5-AFE7-4C9C-AAF8-5EBE68E4F9D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
212180
{03D6F4A5-AFE7-4C9C-AAF8-5EBE68E4F9D8}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -391,14 +359,6 @@ Global
391359
{F2C0FCE9-9F76-4318-826E-892441E4A169}.Release|Any CPU.Build.0 = Release|Any CPU
392360
{F2C0FCE9-9F76-4318-826E-892441E4A169}.Release|x64.ActiveCfg = Release|Any CPU
393361
{F2C0FCE9-9F76-4318-826E-892441E4A169}.Release|x64.Build.0 = Release|Any CPU
394-
{C5D5BEBF-DC10-4065-A27B-AB56E1ABCA47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
395-
{C5D5BEBF-DC10-4065-A27B-AB56E1ABCA47}.Debug|Any CPU.Build.0 = Debug|Any CPU
396-
{C5D5BEBF-DC10-4065-A27B-AB56E1ABCA47}.Debug|x64.ActiveCfg = Debug|Any CPU
397-
{C5D5BEBF-DC10-4065-A27B-AB56E1ABCA47}.Debug|x64.Build.0 = Debug|Any CPU
398-
{C5D5BEBF-DC10-4065-A27B-AB56E1ABCA47}.Release|Any CPU.ActiveCfg = Release|Any CPU
399-
{C5D5BEBF-DC10-4065-A27B-AB56E1ABCA47}.Release|Any CPU.Build.0 = Release|Any CPU
400-
{C5D5BEBF-DC10-4065-A27B-AB56E1ABCA47}.Release|x64.ActiveCfg = Release|Any CPU
401-
{C5D5BEBF-DC10-4065-A27B-AB56E1ABCA47}.Release|x64.Build.0 = Release|Any CPU
402362
{4EA790BB-76C7-471A-ADE4-6FBD183C461B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
403363
{4EA790BB-76C7-471A-ADE4-6FBD183C461B}.Debug|Any CPU.Build.0 = Debug|Any CPU
404364
{4EA790BB-76C7-471A-ADE4-6FBD183C461B}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -543,22 +503,22 @@ Global
543503
{3E92DD9C-81ED-4C33-81E2-3B829D2255A1}.Release|Any CPU.Build.0 = Release|Any CPU
544504
{3E92DD9C-81ED-4C33-81E2-3B829D2255A1}.Release|x64.ActiveCfg = Release|Any CPU
545505
{3E92DD9C-81ED-4C33-81E2-3B829D2255A1}.Release|x64.Build.0 = Release|Any CPU
546-
{A4C3C76E-8FE2-42D0-9353-BAD1F68A777C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
547-
{A4C3C76E-8FE2-42D0-9353-BAD1F68A777C}.Debug|Any CPU.Build.0 = Debug|Any CPU
548-
{A4C3C76E-8FE2-42D0-9353-BAD1F68A777C}.Debug|x64.ActiveCfg = Debug|Any CPU
549-
{A4C3C76E-8FE2-42D0-9353-BAD1F68A777C}.Debug|x64.Build.0 = Debug|Any CPU
550-
{A4C3C76E-8FE2-42D0-9353-BAD1F68A777C}.Release|Any CPU.ActiveCfg = Release|Any CPU
551-
{A4C3C76E-8FE2-42D0-9353-BAD1F68A777C}.Release|Any CPU.Build.0 = Release|Any CPU
552-
{A4C3C76E-8FE2-42D0-9353-BAD1F68A777C}.Release|x64.ActiveCfg = Release|Any CPU
553-
{A4C3C76E-8FE2-42D0-9353-BAD1F68A777C}.Release|x64.Build.0 = Release|Any CPU
554-
{5F44B7D0-36C5-49FF-B81F-D8F70E2AE21B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
555-
{5F44B7D0-36C5-49FF-B81F-D8F70E2AE21B}.Debug|Any CPU.Build.0 = Debug|Any CPU
556-
{5F44B7D0-36C5-49FF-B81F-D8F70E2AE21B}.Debug|x64.ActiveCfg = Debug|Any CPU
557-
{5F44B7D0-36C5-49FF-B81F-D8F70E2AE21B}.Debug|x64.Build.0 = Debug|Any CPU
558-
{5F44B7D0-36C5-49FF-B81F-D8F70E2AE21B}.Release|Any CPU.ActiveCfg = Release|Any CPU
559-
{5F44B7D0-36C5-49FF-B81F-D8F70E2AE21B}.Release|Any CPU.Build.0 = Release|Any CPU
560-
{5F44B7D0-36C5-49FF-B81F-D8F70E2AE21B}.Release|x64.ActiveCfg = Release|Any CPU
561-
{5F44B7D0-36C5-49FF-B81F-D8F70E2AE21B}.Release|x64.Build.0 = Release|Any CPU
506+
{FBDA9AAB-C725-4F63-AA27-76C937A1EED4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
507+
{FBDA9AAB-C725-4F63-AA27-76C937A1EED4}.Debug|Any CPU.Build.0 = Debug|Any CPU
508+
{FBDA9AAB-C725-4F63-AA27-76C937A1EED4}.Debug|x64.ActiveCfg = Debug|Any CPU
509+
{FBDA9AAB-C725-4F63-AA27-76C937A1EED4}.Debug|x64.Build.0 = Debug|Any CPU
510+
{FBDA9AAB-C725-4F63-AA27-76C937A1EED4}.Release|Any CPU.ActiveCfg = Release|Any CPU
511+
{FBDA9AAB-C725-4F63-AA27-76C937A1EED4}.Release|Any CPU.Build.0 = Release|Any CPU
512+
{FBDA9AAB-C725-4F63-AA27-76C937A1EED4}.Release|x64.ActiveCfg = Release|Any CPU
513+
{FBDA9AAB-C725-4F63-AA27-76C937A1EED4}.Release|x64.Build.0 = Release|Any CPU
514+
{329C7A29-90FF-427A-B676-1E32F9C7E9ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
515+
{329C7A29-90FF-427A-B676-1E32F9C7E9ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
516+
{329C7A29-90FF-427A-B676-1E32F9C7E9ED}.Debug|x64.ActiveCfg = Debug|Any CPU
517+
{329C7A29-90FF-427A-B676-1E32F9C7E9ED}.Debug|x64.Build.0 = Debug|Any CPU
518+
{329C7A29-90FF-427A-B676-1E32F9C7E9ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
519+
{329C7A29-90FF-427A-B676-1E32F9C7E9ED}.Release|Any CPU.Build.0 = Release|Any CPU
520+
{329C7A29-90FF-427A-B676-1E32F9C7E9ED}.Release|x64.ActiveCfg = Release|Any CPU
521+
{329C7A29-90FF-427A-B676-1E32F9C7E9ED}.Release|x64.Build.0 = Release|Any CPU
562522
EndGlobalSection
563523
GlobalSection(SolutionProperties) = preSolution
564524
HideSolutionNode = FALSE
@@ -577,9 +537,6 @@ Global
577537
{59A36AB2-2801-4AF3-A5AA-38B069375F4D} = {B421911A-C928-47FE-B866-80B8A2BA9DEE}
578538
{48D14A80-C613-42C4-9A6F-7737B7751893} = {B421911A-C928-47FE-B866-80B8A2BA9DEE}
579539
{417CA47F-36DE-4F6E-B53D-330D2B373ECF} = {B421911A-C928-47FE-B866-80B8A2BA9DEE}
580-
{8FB158D4-737F-4C15-8650-A6F85810062D} = {D447649D-768F-44E8-8ECA-C711CD882DBB}
581-
{074A3366-670D-4ADD-9487-598935CCDC26} = {D447649D-768F-44E8-8ECA-C711CD882DBB}
582-
{27B9333A-51F9-4A55-A4AB-733E6C04FBEC} = {D447649D-768F-44E8-8ECA-C711CD882DBB}
583540
{03D6F4A5-AFE7-4C9C-AAF8-5EBE68E4F9D8} = {9E916E68-E9C5-4A06-96FA-EE9E57DAF368}
584541
{877A1BC6-6FCF-411C-AEC9-64E8CF92E636} = {9E916E68-E9C5-4A06-96FA-EE9E57DAF368}
585542
{31FC394A-67CE-47A0-A57F-351F0549B82D} = {8999FDCC-9EEF-43E3-AE55-4E3F85B245C4}
@@ -615,7 +572,6 @@ Global
615572
{EA9E37C6-8C62-4370-A9CF-369D002B89B6} = {7C3A7DA5-CBEB-420F-B7AC-CDE34BE2D52E}
616573
{F2C0FCE9-9F76-4318-826E-892441E4A169} = {EF9F8695-25DE-4FE4-894A-6DE24E0BDD73}
617574
{F59681C2-D829-4538-A41A-568F7A7D07FD} = {07244E99-AD12-408A-A83B-04E03AABEEBC}
618-
{C5D5BEBF-DC10-4065-A27B-AB56E1ABCA47} = {F59681C2-D829-4538-A41A-568F7A7D07FD}
619575
{B76DD928-A78E-497C-BA7D-83C5864452F9} = {B421911A-C928-47FE-B866-80B8A2BA9DEE}
620576
{4EA790BB-76C7-471A-ADE4-6FBD183C461B} = {B76DD928-A78E-497C-BA7D-83C5864452F9}
621577
{FCB853B8-41CF-43CA-8654-9B5FF770F53D} = {6D589303-EC5C-405C-B9F6-06FE3500FCCB}
@@ -642,8 +598,8 @@ Global
642598
{3E92DD9C-81ED-4C33-81E2-3B829D2255A1} = {A8922B99-5AF5-4180-BC1D-266885AA4CF0}
643599
{E614C33B-B848-466F-B360-70C378F19B7A} = {B421911A-C928-47FE-B866-80B8A2BA9DEE}
644600
{2758A82A-66D7-4831-96AC-F70E45965D3B} = {07244E99-AD12-408A-A83B-04E03AABEEBC}
645-
{A4C3C76E-8FE2-42D0-9353-BAD1F68A777C} = {2758A82A-66D7-4831-96AC-F70E45965D3B}
646-
{5F44B7D0-36C5-49FF-B81F-D8F70E2AE21B} = {2758A82A-66D7-4831-96AC-F70E45965D3B}
601+
{FBDA9AAB-C725-4F63-AA27-76C937A1EED4} = {2758A82A-66D7-4831-96AC-F70E45965D3B}
602+
{329C7A29-90FF-427A-B676-1E32F9C7E9ED} = {2758A82A-66D7-4831-96AC-F70E45965D3B}
647603
EndGlobalSection
648604
GlobalSection(ExtensibilityGlobals) = postSolution
649605
SolutionGuid = {98369941-33DD-450C-A410-B9A91C8CDE91}

‎samples/csharp/AutoML-Preview-0.16-All-Samples.sln

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)