Skip to content

Commit 70d7eab

Browse files
hvermisdsgouda
authored andcommitted
[Datafactory] Updating Assembly version for release and adding a serialization test for new activities (#5640)
* Updating Assmebly version for release and adding a test * Adding test for validation activity
1 parent 81d3238 commit 70d7eab

File tree

4 files changed

+61
-27
lines changed

4 files changed

+61
-27
lines changed

src/SDKs/DataFactory/DataFactory.Tests/JsonSamples/PipelineJsonSamples.cs

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3496,5 +3496,57 @@ public class PipelineJsonSamples : JsonSampleCollection<PipelineJsonSamples>
34963496
}
34973497
}
34983498
";
3499+
3500+
[JsonSample(version: "WebhookActivity")]
3501+
public const string Webhook = @"
3502+
{
3503+
name: ""MyPipelineName"",
3504+
properties: {
3505+
activities: [
3506+
{
3507+
""name"": ""Webhook1"",
3508+
""type"": ""WebHook"",
3509+
""typeProperties"": {
3510+
""url"": ""http://samplesample.azurewebsites.net/api/execute/webhook"",
3511+
""method"": ""POST"",
3512+
""headers"": {
3513+
""Content-Type"": ""application/json""
3514+
},
3515+
""body"": {
3516+
""key"": ""value""
3517+
},
3518+
""timeout"": ""00:03:00""
3519+
}
3520+
}
3521+
]
3522+
}
3523+
}";
3524+
3525+
[JsonSample(version: "ValidationActivity")]
3526+
public const string Validation = @"
3527+
{
3528+
name: ""MyPipelineName"",
3529+
properties: {
3530+
activities: [
3531+
{
3532+
    ""type"": ""Validation"",
3533+
    ""name"": ""ValidationActivity"",
3534+
    ""description"": ""Test activity description"",
3535+
    ""typeProperties"": {
3536+
        ""timeout"": ""00:03:00"",
3537+
        ""sleep"": 10,
3538+
        ""minimumSize"": {
3539+
            ""type"": ""Expression"",
3540+
            ""value"": ""@add(0,1)""
3541+
},
3542+
     ""dataset"": {
3543+
         ""referenceName"": ""FileDataset"",
3544+
         ""type"": ""DatasetReference""
3545+
     }
3546+
}
3547+
}
3548+
]
3549+
}
3550+
}";
34993551
}
35003552
}

src/SDKs/DataFactory/Management.DataFactory/Microsoft.Azure.Management.DataFactory.csproj

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,12 @@
66
<PropertyGroup>
77
<PackageId>Microsoft.Azure.Management.DataFactory</PackageId>
88
<Description>Azure Data Factory V2 is the data integration platform that goes beyond Azure Data Factory V1's orchestration and batch-processing of time-series data, with a general purpose app model supporting modern data warehousing patterns and scenarios, lift-and-shift SSIS, and data-driven SaaS applications. Compose and manage reliable and secure data integration workflows at scale. Use native ADF data connectors and Integration Runtimes to move and transform cloud and on-premises data that can be unstructured, semi-structured, and structured with Hadoop, Azure Data Lake, Spark, SQL Server, Cosmos DB and many other data platforms.</Description>
9-
<Version>3.0.1</Version>
9+
<Version>3.0.2</Version>
1010
<AssemblyName>Microsoft.Azure.Management.DataFactory</AssemblyName>
1111
<PackageTags>Microsoft Azure resource management;Data Factory;ADF;</PackageTags>
1212
<PackageReleaseNotes> <![CDATA[
13-
- Fixed AzureFunctionActivity
14-
- Added support for RestService Source
15-
- Added support for SAP BW Open Hub Source
16-
- Added support for collectionReference
17-
- Added recovery mode for more advanced pipeline run retry capabilities (i.e. from a specific activity)
18-
- Added newClusterDriverNodeType, newClusterInitScripts, and newClusterEnableElasticDisk properties to DataBricks linked service
19-
- Added retentionTimeInDays property to CustomActivity
20-
- New connectors supported as Copy source:
21-
* Office365
22-
* Native MongoDB
23-
* CosmosDB MongoDB API
24-
* ADLS Gen2
25-
* Dynamics AX
26-
* Azure Data Explorer
27-
* Oracle Service Cloud
28-
* GoogleAdWords
29-
- New connector supported as copy sink:
30-
* ADLS Gen2
31-
* CosmosDB MongoDB API
32-
* Azure Data Explorer
33-
- Added support for incremental copy of files based on the lastModifiedTime for S3, File and Blob
34-
- Added support to copy data from ADLS Gen1 to ADLS Gen2 with ACL
35-
- Added support for ServiceUrl in the existing S3 linked service
36-
- Added support for AADServicePrincipal authentication in OData linked service
37-
- Added support for maxConcurrentConnections in copy source and sink
13+
- Added new Validation and Webhook activities
14+
- Added annotation property to Trigger resource
3815
]]></PackageReleaseNotes>
3916
</PropertyGroup>
4017
<PropertyGroup>

src/SDKs/DataFactory/Management.DataFactory/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
[assembly: AssemblyTitle("Microsoft Azure Data Factory Management Library")]
88
[assembly: AssemblyDescription("Provides management functionality for Microsoft Azure Data Factory Resources.")]
99
[assembly: AssemblyVersion("3.0.0.0")]
10-
[assembly: AssemblyFileVersion("3.0.1.0")]
10+
[assembly: AssemblyFileVersion("3.0.2.0")]
1111
[assembly: AssemblyConfiguration("")]
1212
[assembly: AssemblyCompany("Microsoft")]
1313
[assembly: AssemblyProduct("Microsoft Azure .NET SDK")]

src/SDKs/DataFactory/Management.DataFactory/changelog.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
## Current version
44
### Feature Additions
55

6+
## Version 3.0.2
7+
### Feature Additions
8+
- Added new Validation and Webhook activities
9+
- Added annotation property to Trigger resource
10+
611
## Version 3.0.1
712
### Feature Additions
813
- Fixed AzureFunctionActivity

0 commit comments

Comments
 (0)