Skip to content

Commit 65a4800

Browse files
MiYanniMiYanni
committed
Cleaned up .gitignore. Added ability to load ModuleMap and ModuleSkipList from a file.
1 parent 2eedc72 commit 65a4800

File tree

5 files changed

+184
-51
lines changed

5 files changed

+184
-51
lines changed

‎.gitignore

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -222,15 +222,10 @@ groupMapping*.json
222222
*.wixpdb
223223

224224
.vscode/
225-
/tools/AutomationTestFramework/RunBooks
226-
/tools/AutomationTestFramework/TestHelpers/TestHelpers.zip
225+
/tools/AutomationTestFramework/Runbooks
227226
Results
228227
Package
229228
.DS_Store
230229
.idea
231-
/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Logger/bin
232-
/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/bin
233-
/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/bin
234-
/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/bin
235-
/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/bin
236-
/tools/NetCoreCsProjSync/NetCoreCsProjSync/Properties/launchSettings.json
230+
/src/ResourceManager/RecoveryServices.Backup/**/bin
231+
launchSettings.json

‎tools/NetCoreCsProjSync/NetCoreCsProjSync/ModuleMap.json

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
{
2+
"AnalysisServices": [
3+
"Management.Analysis"
4+
],
5+
"ApiManagement.ServiceManagement": [
6+
"Management.ApiManagement"
7+
],
8+
"AzureBackup": [
9+
"Management.BackupServices",
10+
"WindowsAzure.Management.Scheduler"
11+
],
12+
"Batch": [
13+
"Azure.Batch",
14+
"Management.Batch"
15+
],
16+
"Management.CognitiveServices": [
17+
"Management.CognitiveServices"
18+
],
19+
"Compute": [
20+
"Management.Compute",
21+
"Management.KeyVault"
22+
],
23+
"DataFactories": [
24+
"Management.DataFactories",
25+
"DataTransfer.Gateway.Encryption"
26+
],
27+
"DataFactoryV2": [
28+
"Management.DataFactory"
29+
],
30+
"DataLakeAnalytics": [
31+
"Management.DataLake.Analytics"
32+
],
33+
"DataLakeStore": [
34+
"Management.DataLake.Store"
35+
],
36+
"HDInsight": [
37+
"Management.HDInsight",
38+
"Management.HDInsight.Job"
39+
],
40+
"Insights": [
41+
"Management.Monitor"
42+
],
43+
"KeyVault": [
44+
"Azure.KeyVault",
45+
"Azure.KeyVault.WebKey",
46+
"Management.KeyVault"
47+
],
48+
"LogicApp": [
49+
"Management.Logic",
50+
"Management.WebSites"
51+
],
52+
"OperationalInsights": [
53+
"Management.OperationalInsights",
54+
"Azure.OperationalInsights"
55+
],
56+
"Partner": [
57+
"Management.ManagementPartner"
58+
],
59+
"PowerBI": [
60+
"Management.PowerBIDedicated"
61+
],
62+
"Management.PowerBIEmbedded": [
63+
"Management.PowerBIEmbedded"
64+
],
65+
"RecoveryServices.Backup.Cmdlets": [
66+
"Management.RecoveryServices.Backup"
67+
],
68+
"RecoveryServices.Backup.Helpers": [
69+
"Management.RecoveryServices.Backup"
70+
],
71+
"RecoveryServices.Backup.Models": [
72+
"Management.RecoveryServices.Backup"
73+
],
74+
"RecoveryServices.Backup.Providers": [
75+
"Management.RecoveryServices.Backup"
76+
],
77+
"RecoveryServices.Backup.ServiceClientAdapter": [
78+
"Management.RecoveryServices",
79+
"Management.RecoveryServices.Backup"
80+
],
81+
"RecoveryServices.SiteRecovery": [
82+
"Management.RecoveryServices",
83+
"Management.RecoveryServices.SiteRecovery"
84+
],
85+
"RedisCache": [
86+
"Azure.Insights",
87+
"Management.Redis"
88+
],
89+
"Resources": [
90+
"Management.Authorization"
91+
],
92+
"Resources.Rest": [
93+
"Management.ResourceManager"
94+
],
95+
"ServiceFabric": [
96+
"Azure.KeyVault",
97+
"Azure.KeyVault.WebKey",
98+
"Management.Compute",
99+
"Management.KeyVault",
100+
"Management.Network",
101+
"Management.ResourceManager",
102+
"Management.ServiceFabric",
103+
"Management.Storage"
104+
],
105+
"Sql": [
106+
"Management.Sql",
107+
"Microsoft.Azure.Management.Storage",
108+
"WindowsAzure.Management.Storage"
109+
],
110+
"Management.Storage": [
111+
"Management.Storage"
112+
],
113+
"UsageAggregates": [
114+
"Commerce.UsageAggregates"
115+
]
116+
}

‎tools/NetCoreCsProjSync/NetCoreCsProjSync/ModuleSkipList.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[
2+
"Aks",
3+
"AnalysisServices.Dataplane",
4+
"Compute.ManagedService",
5+
"Profile",
6+
"RecoveryServices.Backup.Logger",
7+
"Tags"
8+
]

‎tools/NetCoreCsProjSync/NetCoreCsProjSync/NetCoreCsProjGenerator.cs

Lines changed: 48 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
using System.Xml.Serialization;
2020
using NetCoreCsProjSync.NewModel;
2121
using NetCoreCsProjSync.OldModel;
22+
using Newtonsoft.Json;
2223

2324
namespace NetCoreCsProjSync
2425
{
@@ -62,50 +63,54 @@ public static IEnumerable<OldProjectDefinition> GetDesktopDefinitions(IEnumerabl
6263
}
6364
}
6465

65-
public static readonly List<string> ModuleSkipList = new List<string>
66-
{
67-
"Aks",
68-
"AnalysisServices.Dataplane",
69-
"Compute.ManagedService",
70-
"Profile",
71-
"RecoveryServices.Backup.Logger",
72-
"Tags"
73-
};
66+
public static readonly List<string> ModuleSkipList = File.Exists("ModuleSkipList.json")
67+
? JsonConvert.DeserializeObject<List<string>>(File.ReadAllText("ModuleSkipList.json")) :
68+
new List<string>
69+
{
70+
"Aks",
71+
"AnalysisServices.Dataplane",
72+
"Compute.ManagedService",
73+
"Profile",
74+
"RecoveryServices.Backup.Logger",
75+
"Tags"
76+
};
7477

75-
public static readonly Dictionary<string, List<string>> ModuleMap = new Dictionary<string, List<string>>
76-
{
77-
{ "AnalysisServices", new List<string> { "Management.Analysis" } },
78-
{ "ApiManagement.ServiceManagement", new List<string> { "Management.ApiManagement" } },
79-
{ "AzureBackup", new List<string> { "Management.BackupServices", "WindowsAzure.Management.Scheduler" } },
80-
{ "Batch", new List<string> { "Azure.Batch", "Management.Batch" } },
81-
{ "Management.CognitiveServices", new List<string> { "Management.CognitiveServices" } },
82-
{ "Compute", new List<string> { "Management.Compute", "Management.KeyVault" } },
83-
{ "DataFactories", new List<string> { "Management.DataFactories", "DataTransfer.Gateway.Encryption" } },
84-
{ "DataFactoryV2", new List<string> { "Management.DataFactory" } },
85-
{ "DataLakeAnalytics", new List<string> { "Management.DataLake.Analytics" } },
86-
{ "DataLakeStore", new List<string> { "Management.DataLake.Store" } },
87-
{ "HDInsight", new List<string> { "Management.HDInsight", "Management.HDInsight.Job" } },
88-
{ "Insights", new List<string> { "Management.Monitor" } },
89-
{ "KeyVault", new List<string> { "Azure.KeyVault", "Azure.KeyVault.WebKey", "Management.KeyVault" } },
90-
{ "LogicApp", new List<string> { "Management.Logic", "Management.WebSites" } },
91-
{ "OperationalInsights", new List<string> { "Management.OperationalInsights", "Azure.OperationalInsights" } },
92-
{ "Partner", new List<string> { "Management.ManagementPartner" } },
93-
{ "PowerBI", new List<string> { "Management.PowerBIDedicated" } },
94-
{ "Management.PowerBIEmbedded", new List<string> { "Management.PowerBIEmbedded" } },
95-
{ "RecoveryServices.Backup.Cmdlets", new List<string> { "Management.RecoveryServices.Backup" } },
96-
{ "RecoveryServices.Backup.Helpers", new List<string> { "Management.RecoveryServices.Backup" } },
97-
{ "RecoveryServices.Backup.Models", new List<string> { "Management.RecoveryServices.Backup" } },
98-
{ "RecoveryServices.Backup.Providers", new List<string> { "Management.RecoveryServices.Backup" } },
99-
{ "RecoveryServices.Backup.ServiceClientAdapter", new List<string> { "Management.RecoveryServices", "Management.RecoveryServices.Backup" } },
100-
{ "RecoveryServices.SiteRecovery", new List<string> { "Management.RecoveryServices", "Management.RecoveryServices.SiteRecovery" } },
101-
{ "RedisCache", new List<string> { "Azure.Insights", "Management.Redis" } },
102-
{ "Resources", new List<string> { "Management.Authorization" } },
103-
{ "Resources.Rest", new List<string> { "Management.ResourceManager" } },
104-
{ "ServiceFabric", new List<string> { "Azure.KeyVault", "Azure.KeyVault.WebKey", "Management.Compute", "Management.KeyVault", "Management.Network", "Management.ResourceManager", "Management.ServiceFabric", "Management.Storage" } },
105-
{ "Sql", new List<string> { "Management.Sql", "Microsoft.Azure.Management.Storage", "WindowsAzure.Management.Storage" } },
106-
{ "Management.Storage", new List<string> { "Management.Storage" } },
107-
{ "UsageAggregates", new List<string> { "Commerce.UsageAggregates" } }
108-
};
78+
public static readonly Dictionary<string, List<string>> ModuleMap = File.Exists("ModuleMap.json")
79+
? JsonConvert.DeserializeObject<Dictionary<string, List<string>>>(File.ReadAllText("ModuleMap.json")) :
80+
new Dictionary<string, List<string>>
81+
{
82+
{ "AnalysisServices", new List<string> { "Management.Analysis" } },
83+
{ "ApiManagement.ServiceManagement", new List<string> { "Management.ApiManagement" } },
84+
{ "AzureBackup", new List<string> { "Management.BackupServices", "WindowsAzure.Management.Scheduler" } },
85+
{ "Batch", new List<string> { "Azure.Batch", "Management.Batch" } },
86+
{ "Management.CognitiveServices", new List<string> { "Management.CognitiveServices" } },
87+
{ "Compute", new List<string> { "Management.Compute", "Management.KeyVault" } },
88+
{ "DataFactories", new List<string> { "Management.DataFactories", "DataTransfer.Gateway.Encryption" } },
89+
{ "DataFactoryV2", new List<string> { "Management.DataFactory" } },
90+
{ "DataLakeAnalytics", new List<string> { "Management.DataLake.Analytics" } },
91+
{ "DataLakeStore", new List<string> { "Management.DataLake.Store" } },
92+
{ "HDInsight", new List<string> { "Management.HDInsight", "Management.HDInsight.Job" } },
93+
{ "Insights", new List<string> { "Management.Monitor" } },
94+
{ "KeyVault", new List<string> { "Azure.KeyVault", "Azure.KeyVault.WebKey", "Management.KeyVault" } },
95+
{ "LogicApp", new List<string> { "Management.Logic", "Management.WebSites" } },
96+
{ "OperationalInsights", new List<string> { "Management.OperationalInsights", "Azure.OperationalInsights" } },
97+
{ "Partner", new List<string> { "Management.ManagementPartner" } },
98+
{ "PowerBI", new List<string> { "Management.PowerBIDedicated" } },
99+
{ "Management.PowerBIEmbedded", new List<string> { "Management.PowerBIEmbedded" } },
100+
{ "RecoveryServices.Backup.Cmdlets", new List<string> { "Management.RecoveryServices.Backup" } },
101+
{ "RecoveryServices.Backup.Helpers", new List<string> { "Management.RecoveryServices.Backup" } },
102+
{ "RecoveryServices.Backup.Models", new List<string> { "Management.RecoveryServices.Backup" } },
103+
{ "RecoveryServices.Backup.Providers", new List<string> { "Management.RecoveryServices.Backup" } },
104+
{ "RecoveryServices.Backup.ServiceClientAdapter", new List<string> { "Management.RecoveryServices", "Management.RecoveryServices.Backup" } },
105+
{ "RecoveryServices.SiteRecovery", new List<string> { "Management.RecoveryServices", "Management.RecoveryServices.SiteRecovery" } },
106+
{ "RedisCache", new List<string> { "Azure.Insights", "Management.Redis" } },
107+
{ "Resources", new List<string> { "Management.Authorization" } },
108+
{ "Resources.Rest", new List<string> { "Management.ResourceManager" } },
109+
{ "ServiceFabric", new List<string> { "Azure.KeyVault", "Azure.KeyVault.WebKey", "Management.Compute", "Management.KeyVault", "Management.Network", "Management.ResourceManager", "Management.ServiceFabric", "Management.Storage" } },
110+
{ "Sql", new List<string> { "Management.Sql", "Microsoft.Azure.Management.Storage", "WindowsAzure.Management.Storage" } },
111+
{ "Management.Storage", new List<string> { "Management.Storage" } },
112+
{ "UsageAggregates", new List<string> { "Commerce.UsageAggregates" } }
113+
};
109114

110115
public static Version StringToVersion(string version) => new Version(version.Split('-').First());
111116

‎tools/NetCoreCsProjSync/NetCoreCsProjSync/NetCoreCsProjSync.csproj

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,13 @@
2121
<PackageReference Include="System.ValueTuple" Version="4.5.0-preview1-26216-02" />
2222
</ItemGroup>
2323

24+
<ItemGroup>
25+
<None Update="ModuleMap.json">
26+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
27+
</None>
28+
<None Update="ModuleSkipList.json">
29+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
30+
</None>
31+
</ItemGroup>
32+
2433
</Project>

0 commit comments

Comments
 (0)