Skip to content

Commit 7c45399

Browse files
wyunchi-mswyunchi-ms
authored
Rename the folder of DataFactory (#23696)
* Rename the folder of DataFactory * Rename the folder of DataFactory * Rename the folder of DataFactory
1 parent 5fccb81 commit 7c45399

File tree

233 files changed

+98
-34
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

233 files changed

+98
-34
lines changed

‎src/DataFactory/DataFactory.sln

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,19 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuthenticationAssemblyLoadC
1717
EndProject
1818
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authenticators", "..\Accounts\Authenticators\Authenticators.csproj", "{AB4B3697-55AC-411C-8EFA-A41229BD600F}"
1919
EndProject
20+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataFactory", "DataFactory\DataFactory.csproj", "{AEEC66C5-9F79-4D6E-AB0F-DDE81DCC2B86}"
21+
EndProject
2022
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{6C954E12-1CCA-4448-BBEC-C9781C0766CA}"
2123
EndProject
22-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataFactories.Test", "DataFactories.Test\DataFactories.Test.csproj", "{E605E459-E307-43BC-8787-36B90E037CD4}"
24+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataFactoryV1.Test", "DataFactoryV1.Test\DataFactoryV1.Test.csproj", "{747E1386-AB01-4D81-B2A6-7FB5DA837EFC}"
2325
EndProject
24-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataFactories", "DataFactories\DataFactories.csproj", "{75A68A74-E394-4931-9953-65F4F178EB92}"
26+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataFactoryV1", "DataFactoryV1\DataFactoryV1.csproj", "{483CA50D-8B49-44D9-9FF4-BEFD7F867AA2}"
2527
EndProject
2628
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataFactory.Management.Sdk", "DataFactory.Management.Sdk\DataFactory.Management.Sdk.csproj", "{451FBF9A-2667-453B-AD7D-63001D0C7509}"
2729
EndProject
28-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataFactoryV2.Test", "DataFactoryV2.Test\DataFactoryV2.Test.csproj", "{FB7A88FF-93A8-423B-85A1-7901F6162BCC}"
30+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataFactoryV2.Test", "DataFactoryV2.Test\DataFactoryV2.Test.csproj", "{43318957-1D72-43B6-95B2-422B0EAEC537}"
2931
EndProject
30-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataFactoryV2", "DataFactoryV2\DataFactoryV2.csproj", "{F12394B9-2BEB-45F1-8DE2-8BE4690CEFF2}"
32+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataFactoryV2", "DataFactoryV2\DataFactoryV2.csproj", "{A7181E1C-66E2-461A-8DC2-F04E78131287}"
3133
EndProject
3234
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestFx", "..\..\tools\TestFx\TestFx.csproj", "{606D032A-FA9D-4AD1-9926-AF86BE5FB044}"
3335
EndProject
@@ -64,30 +66,34 @@ Global
6466
{AB4B3697-55AC-411C-8EFA-A41229BD600F}.Debug|Any CPU.Build.0 = Debug|Any CPU
6567
{AB4B3697-55AC-411C-8EFA-A41229BD600F}.Release|Any CPU.ActiveCfg = Release|Any CPU
6668
{AB4B3697-55AC-411C-8EFA-A41229BD600F}.Release|Any CPU.Build.0 = Release|Any CPU
67-
{E605E459-E307-43BC-8787-36B90E037CD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
68-
{E605E459-E307-43BC-8787-36B90E037CD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
69-
{E605E459-E307-43BC-8787-36B90E037CD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
70-
{E605E459-E307-43BC-8787-36B90E037CD4}.Release|Any CPU.Build.0 = Release|Any CPU
71-
{75A68A74-E394-4931-9953-65F4F178EB92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
72-
{75A68A74-E394-4931-9953-65F4F178EB92}.Debug|Any CPU.Build.0 = Debug|Any CPU
73-
{75A68A74-E394-4931-9953-65F4F178EB92}.Release|Any CPU.ActiveCfg = Release|Any CPU
74-
{75A68A74-E394-4931-9953-65F4F178EB92}.Release|Any CPU.Build.0 = Release|Any CPU
7569
{451FBF9A-2667-453B-AD7D-63001D0C7509}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7670
{451FBF9A-2667-453B-AD7D-63001D0C7509}.Debug|Any CPU.Build.0 = Debug|Any CPU
7771
{451FBF9A-2667-453B-AD7D-63001D0C7509}.Release|Any CPU.ActiveCfg = Release|Any CPU
7872
{451FBF9A-2667-453B-AD7D-63001D0C7509}.Release|Any CPU.Build.0 = Release|Any CPU
79-
{FB7A88FF-93A8-423B-85A1-7901F6162BCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
80-
{FB7A88FF-93A8-423B-85A1-7901F6162BCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
81-
{FB7A88FF-93A8-423B-85A1-7901F6162BCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
82-
{FB7A88FF-93A8-423B-85A1-7901F6162BCC}.Release|Any CPU.Build.0 = Release|Any CPU
83-
{F12394B9-2BEB-45F1-8DE2-8BE4690CEFF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
84-
{F12394B9-2BEB-45F1-8DE2-8BE4690CEFF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
85-
{F12394B9-2BEB-45F1-8DE2-8BE4690CEFF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
86-
{F12394B9-2BEB-45F1-8DE2-8BE4690CEFF2}.Release|Any CPU.Build.0 = Release|Any CPU
8773
{606D032A-FA9D-4AD1-9926-AF86BE5FB044}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8874
{606D032A-FA9D-4AD1-9926-AF86BE5FB044}.Debug|Any CPU.Build.0 = Debug|Any CPU
8975
{606D032A-FA9D-4AD1-9926-AF86BE5FB044}.Release|Any CPU.ActiveCfg = Release|Any CPU
9076
{606D032A-FA9D-4AD1-9926-AF86BE5FB044}.Release|Any CPU.Build.0 = Release|Any CPU
77+
{AEEC66C5-9F79-4D6E-AB0F-DDE81DCC2B86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
78+
{AEEC66C5-9F79-4D6E-AB0F-DDE81DCC2B86}.Debug|Any CPU.Build.0 = Debug|Any CPU
79+
{AEEC66C5-9F79-4D6E-AB0F-DDE81DCC2B86}.Release|Any CPU.ActiveCfg = Release|Any CPU
80+
{AEEC66C5-9F79-4D6E-AB0F-DDE81DCC2B86}.Release|Any CPU.Build.0 = Release|Any CPU
81+
{43318957-1D72-43B6-95B2-422B0EAEC537}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
82+
{43318957-1D72-43B6-95B2-422B0EAEC537}.Debug|Any CPU.Build.0 = Debug|Any CPU
83+
{43318957-1D72-43B6-95B2-422B0EAEC537}.Release|Any CPU.ActiveCfg = Release|Any CPU
84+
{43318957-1D72-43B6-95B2-422B0EAEC537}.Release|Any CPU.Build.0 = Release|Any CPU
85+
{A7181E1C-66E2-461A-8DC2-F04E78131287}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
86+
{A7181E1C-66E2-461A-8DC2-F04E78131287}.Debug|Any CPU.Build.0 = Debug|Any CPU
87+
{A7181E1C-66E2-461A-8DC2-F04E78131287}.Release|Any CPU.ActiveCfg = Release|Any CPU
88+
{A7181E1C-66E2-461A-8DC2-F04E78131287}.Release|Any CPU.Build.0 = Release|Any CPU
89+
{747E1386-AB01-4D81-B2A6-7FB5DA837EFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
90+
{747E1386-AB01-4D81-B2A6-7FB5DA837EFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
91+
{747E1386-AB01-4D81-B2A6-7FB5DA837EFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
92+
{747E1386-AB01-4D81-B2A6-7FB5DA837EFC}.Release|Any CPU.Build.0 = Release|Any CPU
93+
{483CA50D-8B49-44D9-9FF4-BEFD7F867AA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
94+
{483CA50D-8B49-44D9-9FF4-BEFD7F867AA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
95+
{483CA50D-8B49-44D9-9FF4-BEFD7F867AA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
96+
{483CA50D-8B49-44D9-9FF4-BEFD7F867AA2}.Release|Any CPU.Build.0 = Release|Any CPU
9197
EndGlobalSection
9298
GlobalSection(NestedProjects) = preSolution
9399
{E87810E9-281C-4257-8FA4-8D9ADA88F3B8} = {0F44400B-640A-4139-8742-DA34FF27FB3B}
@@ -96,8 +102,8 @@ Global
96102
{70271003-5CE9-4BB3-BEA6-FE69E3AAB64C} = {0F44400B-640A-4139-8742-DA34FF27FB3B}
97103
{D5C88C51-A12E-456A-966A-4E6458837A16} = {0F44400B-640A-4139-8742-DA34FF27FB3B}
98104
{AB4B3697-55AC-411C-8EFA-A41229BD600F} = {0F44400B-640A-4139-8742-DA34FF27FB3B}
99-
{E605E459-E307-43BC-8787-36B90E037CD4} = {6C954E12-1CCA-4448-BBEC-C9781C0766CA}
100-
{FB7A88FF-93A8-423B-85A1-7901F6162BCC} = {6C954E12-1CCA-4448-BBEC-C9781C0766CA}
101105
{606D032A-FA9D-4AD1-9926-AF86BE5FB044} = {6C954E12-1CCA-4448-BBEC-C9781C0766CA}
106+
{43318957-1D72-43B6-95B2-422B0EAEC537} = {6C954E12-1CCA-4448-BBEC-C9781C0766CA}
107+
{747E1386-AB01-4D81-B2A6-7FB5DA837EFC} = {6C954E12-1CCA-4448-BBEC-C9781C0766CA}
102108
EndGlobalSection
103109
EndGlobal

‎src/DataFactory/DataFactoryV2/Az.DataFactory.psd1 renamed to ‎src/DataFactory/DataFactory/Az.DataFactory.psd1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ ScriptsToProcess = @()
6969
TypesToProcess = @()
7070

7171
# Format files (.ps1xml) to be loaded when importing this module
72-
FormatsToProcess = 'DataFactories.format.ps1xml', 'DataFactoryV2.format.ps1xml'
72+
FormatsToProcess = 'DataFactoryV1.format.ps1xml', 'DataFactoryV2.format.ps1xml'
7373

7474
# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
75-
NestedModules = @('Microsoft.Azure.PowerShell.Cmdlets.DataFactories.dll',
76-
'Microsoft.Azure.PowerShell.Cmdlets.DataFactoryV2.dll')
75+
NestedModules = @('Microsoft.Azure.PowerShell.Cmdlets.DataFactoryV1.dll',
76+
'Microsoft.Azure.PowerShell.Cmdlets.DataFactoryV2.dll')
7777

7878
# Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
7979
FunctionsToExport = @()

‎src/DataFactory/DataFactoryV2/ChangeLog.md renamed to ‎src/DataFactory/DataFactory/ChangeLog.md

‎src/DataFactory/DataFactory/DataFactory.csproj

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<Import Project="$(MSBuildThisFileDirectory)..\..\Az.props" />
4+
<Import Project="$(MSBuildThisFileDirectory)..\..\psm1.props" />
5+
6+
<PropertyGroup>
7+
<PsModuleName>DataFactory</PsModuleName>
8+
</PropertyGroup>
9+
10+
<PropertyGroup>
11+
<TargetFramework>netstandard2.0</TargetFramework>
12+
<AssemblyName>$(AzAssemblyPrefix)$(PsModuleName)</AssemblyName>
13+
<RootNamespace>$(AzAssemblyPrefix)$(PsModuleName)</RootNamespace>
14+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
15+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
16+
<OutputPath>$(RepoArtifacts)$(Configuration)\Az.$(PsModuleName)\</OutputPath>
17+
<PublishDir>$(OutputPath)</PublishDir>
18+
</PropertyGroup>
19+
20+
<!-- Assets -->
21+
<ItemGroup>
22+
<None Update="Az.$(PsModuleName).psd1" CopyToOutputDirectory="PreserveNewest" />
23+
<None Update="help\*.md" CopyToOutputDirectory="PreserveNewest" />
24+
</ItemGroup>
25+
26+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.Post.props" />
27+
28+
</Project>

‎src/DataFactory/DataFactory/Properties/AssemblyInfo.cs

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// ----------------------------------------------------------------------------------
2+
//
3+
// Copyright Microsoft Corporation
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
// ----------------------------------------------------------------------------------
14+
15+
using System;
16+
using System.Reflection;
17+
using System.Runtime.CompilerServices;
18+
using System.Runtime.InteropServices;
19+
20+
[assembly: AssemblyTitle("Microsoft Azure Powershell - DataFactory Manager")]
21+
[assembly: AssemblyCompany(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyCompany)]
22+
[assembly: AssemblyProduct(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyProduct)]
23+
[assembly: AssemblyCopyright(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyCopyright)]
24+
25+
[assembly: ComVisible(false)]
26+
[assembly: CLSCompliant(false)]
27+
[assembly: Guid("5d024af0-81c9-44f0-b3b0-7080f103fb4d")]
28+
[assembly: AssemblyVersion("1.18.0")]
29+
[assembly: AssemblyFileVersion("1.18.0")]

‎src/DataFactory/DataFactories/UX/Microsoft.Datafactory/factories.json renamed to ‎src/DataFactory/DataFactory/UX/Microsoft.Datafactory/factories.json

File renamed without changes.

‎src/DataFactory/DataFactoryV2/help/Add-AzDataFactoryV2DataFlowDebugSessionPackage.md renamed to ‎src/DataFactory/DataFactory/help/Add-AzDataFactoryV2DataFlowDebugSessionPackage.md

‎src/DataFactory/DataFactoryV2/help/Add-AzDataFactoryV2TriggerSubscription.md renamed to ‎src/DataFactory/DataFactory/help/Add-AzDataFactoryV2TriggerSubscription.md

‎src/DataFactory/DataFactoryV2/help/Az.DataFactory.md renamed to ‎src/DataFactory/DataFactory/help/Az.DataFactory.md

‎src/DataFactory/DataFactoryV2/help/Get-AzDataFactory.md renamed to ‎src/DataFactory/DataFactory/help/Get-AzDataFactory.md

0 commit comments

Comments
 (0)