Skip to content

Commit

Permalink
Minor clean up of v1.4 solution (dotnet#867)
Browse files Browse the repository at this point in the history 
* 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
  • Loading branch information
@harishsk
harishsk authored Dec 22, 2020
1 parent a5ef0ec commit 2990008
Show file tree
Hide file tree
Showing 17 changed files with 36 additions and 260 deletions.
8 changes: 4 additions & 4 deletions .vsts-dotnet-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,9 @@ phases:
queue: Hosted VS2017
steps:
- task: UseDotNet@2
displayName: 'Use .NET Core 3.0'
displayName: 'Use .NET Core 3.1'
inputs:
version: 3.0.x
version: 3.1.x
includePreviewVersions: true
installationPath: $(Agent.ToolsDirectory)/dotnet
- task: DotNetCoreCLI@2
Expand Down Expand Up @@ -194,9 +194,9 @@ phases:
queue: Hosted VS2017
steps:
- task: UseDotNet@2
displayName: 'Use .NET Core 3.0'
displayName: 'Use .NET Core 3.1'
inputs:
version: 3.0.x
version: 3.1.x
includePreviewVersions: true
installationPath: $(Agent.ToolsDirectory)/dotnet
- task: DotNetCoreCLI@2
Expand Down
4 changes: 2 additions & 2 deletions samples/Directory.Build.props
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project>

<PropertyGroup>
<MicrosoftMLVersion>1.5.3</MicrosoftMLVersion>
<MicrosoftMLPreviewVersion>0.17.3</MicrosoftMLPreviewVersion>
<MicrosoftMLVersion>1.5.4</MicrosoftMLVersion>
<MicrosoftMLPreviewVersion>0.17.4</MicrosoftMLPreviewVersion>
</PropertyGroup>

</Project>
84 changes: 20 additions & 64 deletions samples/csharp/v1.4-All-Samples.sln → samples/csharp/All-Samples.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SpikeDetection.Solution", "
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PowerAnomalyDetection.Solution", "PowerAnomalyDetection.Solution", "{417CA47F-36DE-4F6E-B53D-330D2B373ECF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreditCardFraudDetection.Common", "getting-started\BinaryClassification_CreditCardFraudDetection\CreditCardFraudDetection.Common\CreditCardFraudDetection.Common.csproj", "{8FB158D4-737F-4C15-8650-A6F85810062D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreditCardFraudDetection.Predictor", "getting-started\BinaryClassification_CreditCardFraudDetection\CreditCardFraudDetection.Predictor\CreditCardFraudDetection.Predictor.csproj", "{074A3366-670D-4ADD-9487-598935CCDC26}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreditCardFraudDetection.Trainer", "getting-started\BinaryClassification_CreditCardFraudDetection\CreditCardFraudDetection.Trainer\CreditCardFraudDetection.Trainer.csproj", "{27B9333A-51F9-4A55-A4AB-733E6C04FBEC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomerSegmentation.Train", "getting-started\Clustering_CustomerSegmentation\CustomerSegmentation.Train\CustomerSegmentation.Train.csproj", "{03D6F4A5-AFE7-4C9C-AAF8-5EBE68E4F9D8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomerSegmentation.Predict", "getting-started\Clustering_CustomerSegmentation\CustomerSegmentation.Predict\CustomerSegmentation.Predict.csproj", "{877A1BC6-6FCF-411C-AEC9-64E8CF92E636}"
Expand Down Expand Up @@ -105,8 +99,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LargeDatasets", "getting-st
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TFImageClassififcationE2E.Solution", "TFImageClassififcationE2E.Solution", "{F59681C2-D829-4538-A41A-568F7A7D07FD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TensorFlowImageClassification", "end-to-end-apps\DeepLearning_ImageClassification_TensorFlow\TensorFlowImageClassification\TensorFlowImageClassification.csproj", "{C5D5BEBF-DC10-4065-A27B-AB56E1ABCA47}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebRanking.Solution", "WebRanking.Solution", "{B76DD928-A78E-497C-BA7D-83C5864452F9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebRanking", "getting-started\Ranking_Web\WebRanking\WebRanking.csproj", "{4EA790BB-76C7-471A-ADE4-6FBD183C461B}"
Expand Down Expand Up @@ -163,9 +155,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ImageBinaryClassificationMo
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BlazorSentimentAnalysis.Solution", "BlazorSentimentAnalysis.Solution", "{2758A82A-66D7-4831-96AC-F70E45965D3B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorSentimentAnalysis.Server", "end-to-end-apps\ScalableSentimentAnalysisBlazorWebApp\BlazorSentimentAnalysis.Server\BlazorSentimentAnalysis.Server.csproj", "{A4C3C76E-8FE2-42D0-9353-BAD1F68A777C}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorSentiment.Client", "end-to-end-apps\ScalableSentimentAnalysisBlazorWebApp\BlazorSentiment.Client\BlazorSentiment.Client.csproj", "{FBDA9AAB-C725-4F63-AA27-76C937A1EED4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorSentimentAnalysis.Client", "end-to-end-apps\ScalableSentimentAnalysisBlazorWebApp\BlazorSentimentAnalysis.Client\BlazorSentimentAnalysis.Client.csproj", "{5F44B7D0-36C5-49FF-B81F-D8F70E2AE21B}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorSentiment.Server", "end-to-end-apps\ScalableSentimentAnalysisBlazorWebApp\BlazorSentiment.Server\BlazorSentiment.Server.csproj", "{329C7A29-90FF-427A-B676-1E32F9C7E9ED}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -183,30 +175,6 @@ Global
{6E091170-BA63-4DF3-9C71-62DA2157ABB2}.Release|Any CPU.Build.0 = Release|Any CPU
{6E091170-BA63-4DF3-9C71-62DA2157ABB2}.Release|x64.ActiveCfg = Release|Any CPU
{6E091170-BA63-4DF3-9C71-62DA2157ABB2}.Release|x64.Build.0 = Release|Any CPU
{8FB158D4-737F-4C15-8650-A6F85810062D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8FB158D4-737F-4C15-8650-A6F85810062D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8FB158D4-737F-4C15-8650-A6F85810062D}.Debug|x64.ActiveCfg = Debug|Any CPU
{8FB158D4-737F-4C15-8650-A6F85810062D}.Debug|x64.Build.0 = Debug|Any CPU
{8FB158D4-737F-4C15-8650-A6F85810062D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8FB158D4-737F-4C15-8650-A6F85810062D}.Release|Any CPU.Build.0 = Release|Any CPU
{8FB158D4-737F-4C15-8650-A6F85810062D}.Release|x64.ActiveCfg = Release|Any CPU
{8FB158D4-737F-4C15-8650-A6F85810062D}.Release|x64.Build.0 = Release|Any CPU
{074A3366-670D-4ADD-9487-598935CCDC26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{074A3366-670D-4ADD-9487-598935CCDC26}.Debug|Any CPU.Build.0 = Debug|Any CPU
{074A3366-670D-4ADD-9487-598935CCDC26}.Debug|x64.ActiveCfg = Debug|Any CPU
{074A3366-670D-4ADD-9487-598935CCDC26}.Debug|x64.Build.0 = Debug|Any CPU
{074A3366-670D-4ADD-9487-598935CCDC26}.Release|Any CPU.ActiveCfg = Release|Any CPU
{074A3366-670D-4ADD-9487-598935CCDC26}.Release|Any CPU.Build.0 = Release|Any CPU
{074A3366-670D-4ADD-9487-598935CCDC26}.Release|x64.ActiveCfg = Release|Any CPU
{074A3366-670D-4ADD-9487-598935CCDC26}.Release|x64.Build.0 = Release|Any CPU
{27B9333A-51F9-4A55-A4AB-733E6C04FBEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{27B9333A-51F9-4A55-A4AB-733E6C04FBEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{27B9333A-51F9-4A55-A4AB-733E6C04FBEC}.Debug|x64.ActiveCfg = Debug|Any CPU
{27B9333A-51F9-4A55-A4AB-733E6C04FBEC}.Debug|x64.Build.0 = Debug|Any CPU
{27B9333A-51F9-4A55-A4AB-733E6C04FBEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{27B9333A-51F9-4A55-A4AB-733E6C04FBEC}.Release|Any CPU.Build.0 = Release|Any CPU
{27B9333A-51F9-4A55-A4AB-733E6C04FBEC}.Release|x64.ActiveCfg = Release|Any CPU
{27B9333A-51F9-4A55-A4AB-733E6C04FBEC}.Release|x64.Build.0 = Release|Any CPU
{03D6F4A5-AFE7-4C9C-AAF8-5EBE68E4F9D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{03D6F4A5-AFE7-4C9C-AAF8-5EBE68E4F9D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{03D6F4A5-AFE7-4C9C-AAF8-5EBE68E4F9D8}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -391,14 +359,6 @@ Global
{F2C0FCE9-9F76-4318-826E-892441E4A169}.Release|Any CPU.Build.0 = Release|Any CPU
{F2C0FCE9-9F76-4318-826E-892441E4A169}.Release|x64.ActiveCfg = Release|Any CPU
{F2C0FCE9-9F76-4318-826E-892441E4A169}.Release|x64.Build.0 = Release|Any CPU
{C5D5BEBF-DC10-4065-A27B-AB56E1ABCA47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C5D5BEBF-DC10-4065-A27B-AB56E1ABCA47}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C5D5BEBF-DC10-4065-A27B-AB56E1ABCA47}.Debug|x64.ActiveCfg = Debug|Any CPU
{C5D5BEBF-DC10-4065-A27B-AB56E1ABCA47}.Debug|x64.Build.0 = Debug|Any CPU
{C5D5BEBF-DC10-4065-A27B-AB56E1ABCA47}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C5D5BEBF-DC10-4065-A27B-AB56E1ABCA47}.Release|Any CPU.Build.0 = Release|Any CPU
{C5D5BEBF-DC10-4065-A27B-AB56E1ABCA47}.Release|x64.ActiveCfg = Release|Any CPU
{C5D5BEBF-DC10-4065-A27B-AB56E1ABCA47}.Release|x64.Build.0 = Release|Any CPU
{4EA790BB-76C7-471A-ADE4-6FBD183C461B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4EA790BB-76C7-471A-ADE4-6FBD183C461B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4EA790BB-76C7-471A-ADE4-6FBD183C461B}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -543,22 +503,22 @@ Global
{3E92DD9C-81ED-4C33-81E2-3B829D2255A1}.Release|Any CPU.Build.0 = Release|Any CPU
{3E92DD9C-81ED-4C33-81E2-3B829D2255A1}.Release|x64.ActiveCfg = Release|Any CPU
{3E92DD9C-81ED-4C33-81E2-3B829D2255A1}.Release|x64.Build.0 = Release|Any CPU
{A4C3C76E-8FE2-42D0-9353-BAD1F68A777C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A4C3C76E-8FE2-42D0-9353-BAD1F68A777C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A4C3C76E-8FE2-42D0-9353-BAD1F68A777C}.Debug|x64.ActiveCfg = Debug|Any CPU
{A4C3C76E-8FE2-42D0-9353-BAD1F68A777C}.Debug|x64.Build.0 = Debug|Any CPU
{A4C3C76E-8FE2-42D0-9353-BAD1F68A777C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A4C3C76E-8FE2-42D0-9353-BAD1F68A777C}.Release|Any CPU.Build.0 = Release|Any CPU
{A4C3C76E-8FE2-42D0-9353-BAD1F68A777C}.Release|x64.ActiveCfg = Release|Any CPU
{A4C3C76E-8FE2-42D0-9353-BAD1F68A777C}.Release|x64.Build.0 = Release|Any CPU
{5F44B7D0-36C5-49FF-B81F-D8F70E2AE21B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5F44B7D0-36C5-49FF-B81F-D8F70E2AE21B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5F44B7D0-36C5-49FF-B81F-D8F70E2AE21B}.Debug|x64.ActiveCfg = Debug|Any CPU
{5F44B7D0-36C5-49FF-B81F-D8F70E2AE21B}.Debug|x64.Build.0 = Debug|Any CPU
{5F44B7D0-36C5-49FF-B81F-D8F70E2AE21B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5F44B7D0-36C5-49FF-B81F-D8F70E2AE21B}.Release|Any CPU.Build.0 = Release|Any CPU
{5F44B7D0-36C5-49FF-B81F-D8F70E2AE21B}.Release|x64.ActiveCfg = Release|Any CPU
{5F44B7D0-36C5-49FF-B81F-D8F70E2AE21B}.Release|x64.Build.0 = Release|Any CPU
{FBDA9AAB-C725-4F63-AA27-76C937A1EED4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FBDA9AAB-C725-4F63-AA27-76C937A1EED4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FBDA9AAB-C725-4F63-AA27-76C937A1EED4}.Debug|x64.ActiveCfg = Debug|Any CPU
{FBDA9AAB-C725-4F63-AA27-76C937A1EED4}.Debug|x64.Build.0 = Debug|Any CPU
{FBDA9AAB-C725-4F63-AA27-76C937A1EED4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FBDA9AAB-C725-4F63-AA27-76C937A1EED4}.Release|Any CPU.Build.0 = Release|Any CPU
{FBDA9AAB-C725-4F63-AA27-76C937A1EED4}.Release|x64.ActiveCfg = Release|Any CPU
{FBDA9AAB-C725-4F63-AA27-76C937A1EED4}.Release|x64.Build.0 = Release|Any CPU
{329C7A29-90FF-427A-B676-1E32F9C7E9ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{329C7A29-90FF-427A-B676-1E32F9C7E9ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
{329C7A29-90FF-427A-B676-1E32F9C7E9ED}.Debug|x64.ActiveCfg = Debug|Any CPU
{329C7A29-90FF-427A-B676-1E32F9C7E9ED}.Debug|x64.Build.0 = Debug|Any CPU
{329C7A29-90FF-427A-B676-1E32F9C7E9ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
{329C7A29-90FF-427A-B676-1E32F9C7E9ED}.Release|Any CPU.Build.0 = Release|Any CPU
{329C7A29-90FF-427A-B676-1E32F9C7E9ED}.Release|x64.ActiveCfg = Release|Any CPU
{329C7A29-90FF-427A-B676-1E32F9C7E9ED}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -577,9 +537,6 @@ Global
{59A36AB2-2801-4AF3-A5AA-38B069375F4D} = {B421911A-C928-47FE-B866-80B8A2BA9DEE}
{48D14A80-C613-42C4-9A6F-7737B7751893} = {B421911A-C928-47FE-B866-80B8A2BA9DEE}
{417CA47F-36DE-4F6E-B53D-330D2B373ECF} = {B421911A-C928-47FE-B866-80B8A2BA9DEE}
{8FB158D4-737F-4C15-8650-A6F85810062D} = {D447649D-768F-44E8-8ECA-C711CD882DBB}
{074A3366-670D-4ADD-9487-598935CCDC26} = {D447649D-768F-44E8-8ECA-C711CD882DBB}
{27B9333A-51F9-4A55-A4AB-733E6C04FBEC} = {D447649D-768F-44E8-8ECA-C711CD882DBB}
{03D6F4A5-AFE7-4C9C-AAF8-5EBE68E4F9D8} = {9E916E68-E9C5-4A06-96FA-EE9E57DAF368}
{877A1BC6-6FCF-411C-AEC9-64E8CF92E636} = {9E916E68-E9C5-4A06-96FA-EE9E57DAF368}
{31FC394A-67CE-47A0-A57F-351F0549B82D} = {8999FDCC-9EEF-43E3-AE55-4E3F85B245C4}
Expand Down Expand Up @@ -615,7 +572,6 @@ Global
{EA9E37C6-8C62-4370-A9CF-369D002B89B6} = {7C3A7DA5-CBEB-420F-B7AC-CDE34BE2D52E}
{F2C0FCE9-9F76-4318-826E-892441E4A169} = {EF9F8695-25DE-4FE4-894A-6DE24E0BDD73}
{F59681C2-D829-4538-A41A-568F7A7D07FD} = {07244E99-AD12-408A-A83B-04E03AABEEBC}
{C5D5BEBF-DC10-4065-A27B-AB56E1ABCA47} = {F59681C2-D829-4538-A41A-568F7A7D07FD}
{B76DD928-A78E-497C-BA7D-83C5864452F9} = {B421911A-C928-47FE-B866-80B8A2BA9DEE}
{4EA790BB-76C7-471A-ADE4-6FBD183C461B} = {B76DD928-A78E-497C-BA7D-83C5864452F9}
{FCB853B8-41CF-43CA-8654-9B5FF770F53D} = {6D589303-EC5C-405C-B9F6-06FE3500FCCB}
Expand All @@ -642,8 +598,8 @@ Global
{3E92DD9C-81ED-4C33-81E2-3B829D2255A1} = {A8922B99-5AF5-4180-BC1D-266885AA4CF0}
{E614C33B-B848-466F-B360-70C378F19B7A} = {B421911A-C928-47FE-B866-80B8A2BA9DEE}
{2758A82A-66D7-4831-96AC-F70E45965D3B} = {07244E99-AD12-408A-A83B-04E03AABEEBC}
{A4C3C76E-8FE2-42D0-9353-BAD1F68A777C} = {2758A82A-66D7-4831-96AC-F70E45965D3B}
{5F44B7D0-36C5-49FF-B81F-D8F70E2AE21B} = {2758A82A-66D7-4831-96AC-F70E45965D3B}
{FBDA9AAB-C725-4F63-AA27-76C937A1EED4} = {2758A82A-66D7-4831-96AC-F70E45965D3B}
{329C7A29-90FF-427A-B676-1E32F9C7E9ED} = {2758A82A-66D7-4831-96AC-F70E45965D3B}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {98369941-33DD-450C-A410-B9A91C8CDE91}
Expand Down
56 changes: 0 additions & 56 deletions samples/csharp/AutoML-Preview-0.16-All-Samples.sln
View file

This file was deleted.

Loading

0 comments on commit 2990008

Please sign in to comment.