Skip to content

Microsoft CDM Release Version Update: 1.3.0 #252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Phoenix Luo (llawwaii) merged 1 commit into from
Jul 29, 2021
Merged

Microsoft CDM Release Version Update: 1.3.0 #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion ...el.ObjectModel.Adapter.Adls/Microsoft.CommonDataModel.ObjectModel.Adapter.Adls.ALL.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<metadata>

<id>Microsoft.CommonDataModel.ObjectModel.Adapter.Adls.All</id>
<version>1.2.3</version>
<version>1.3.0</version>
<description>The ADLS adapter implementation for the Microsoft Common Data Model Object Model.</description>

<authors>Microsoft</authors>
Expand Down
2 changes: 1 addition & 1 deletion ...aModel.ObjectModel.Adapter.Adls/Microsoft.CommonDataModel.ObjectModel.Adapter.Adls.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net45;net462</TargetFrameworks>
<version>1.2.3</version>
<version>1.3.0</version>
<Description>The ADLS adapter implementation for the Microsoft Common Data Model Object Model.</Description>

<Authors>Microsoft</Authors>
Expand Down
2 changes: 1 addition & 1 deletion ...aModel.ObjectModel.Adapter.Adls/Microsoft.CommonDataModel.ObjectModel.Adapter.Adls.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<metadata>

<id>Microsoft.CommonDataModel.ObjectModel.Adapter.Adls</id>
<version>1.2.3</version>
<version>1.3.0</version>
<description>The ADLS adapter implementation for the Microsoft Common Data Model Object Model.</description>

<authors>Microsoft</authors>
Expand Down
18 changes: 18 additions & 0 deletions objectModel/CSharp/Microsoft.CommonDataModel.ObjectModel.Adapter.Adls/Storage/ADLSAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,11 @@ public string SasToken {
/// </summary>
public TokenProvider TokenProvider { get; set; }

/// <summary>
/// The user-defined token provider ( Async ).
/// </summary>
public TokenProviderAsync TokenProviderAsync { get; set; }

/// <summary>
/// Maximum number of items to be returned by the directory list API.
/// If omitted or greater than 5,000, the response will include up to 5,000 items.
Expand Down Expand Up @@ -214,6 +219,15 @@ public ADLSAdapter(string hostname, string root, TokenProvider tokenProvider) :
this.TokenProvider = tokenProvider;
}

/// <summary>
/// The ADLS constructor for user-defined token provider (Async)).
/// </summary>
public ADLSAdapter(string hostname, TokenProviderAsync tokenProviderAsync) : this()
{
this.Hostname = hostname;
this.TokenProviderAsync = tokenProviderAsync;
}

/// <summary>
/// The ADLS constructor without auth info - the auth configuration is set after the construction.
/// <param name="hostname">Host name</param>
Expand Down Expand Up @@ -624,6 +638,10 @@ private async Task<CdmHttpRequest> BuildRequest(string url, HttpMethod method, s
{
request = this.SetUpCdmRequest(url, new Dictionary<string, string> { { "authorization", $"{this.TokenProvider.GetToken()}" } }, method);
}
else if (this.TokenProviderAsync != null)
{
request = this.SetUpCdmRequest(url, new Dictionary<string, string> { { "authorization", $"{await this.TokenProviderAsync.GetTokenAsync()}" } }, method);
}
else if (this.ClientId != null && this.Tenant != null && this.Secret != null)
{
var token = await this.GenerateBearerToken();
Expand Down
36 changes: 36 additions & 0 deletions ...ObjectModel.Adapter.Syms/Microsoft.CommonDataModel.ObjectModel.Adapter.Syms-github.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net45;net462</TargetFrameworks>
<version>1.3.0-preview1</version>
<Description>The Syms adapter implementation for the Microsoft Common Data Model Object Model.</Description>

<Authors>Microsoft</Authors>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
<Platforms>AnyCPU;x64</Platforms>
<RepositoryUrl>https://commondatamodel.visualstudio.com/CDM/_git/CDM.ObjectModel</RepositoryUrl>
<PackageProjectUrl>https://commondatamodel.visualstudio.com/CDM</PackageProjectUrl>

<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Identity.Client" Version="4.29.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
<PackageReference Include="Microsoft.CSharp" Version="4.6.2" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Microsoft.CommonDataModel.ObjectModel\Microsoft.CommonDataModel.ObjectModel.csproj" />
</ItemGroup>

</Project>
42 changes: 42 additions & 0 deletions ...aModel.ObjectModel.Adapter.Syms/Microsoft.CommonDataModel.ObjectModel.Adapter.Syms.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net45;net462</TargetFrameworks>
<version>1.3.0-preview1</version>
<Description>The Syms adapter implementation for the Microsoft Common Data Model Object Model.</Description>

<Authors>Microsoft</Authors>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
<Platforms>AnyCPU;x64</Platforms>
<RepositoryUrl>https://commondatamodel.visualstudio.com/CDM/_git/CDM.ObjectModel</RepositoryUrl>
<PackageProjectUrl>https://commondatamodel.visualstudio.com/CDM</PackageProjectUrl>
</PropertyGroup>

<PropertyGroup>
<DefineConstants>INTERNAL_VSTS</DefineConstants>
<SignAssembly>true</SignAssembly>
<DelaySign>true</DelaySign>
<KeyFile>$(MSBuildThisFileDirectory)..\StrongNameKey\35MSSharedLib1024.snk</KeyFile>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)..\StrongNameKey\35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Identity.Client" Version="4.29.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
<PackageReference Include="Microsoft.CSharp" Version="4.6.2" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Microsoft.CommonDataModel.ObjectModel\Microsoft.CommonDataModel.ObjectModel.csproj" />
</ItemGroup>

</Project>
48 changes: 48 additions & 0 deletions ...aModel.ObjectModel.Adapter.Syms/Microsoft.CommonDataModel.ObjectModel.Adapter.Syms.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>

<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">

<metadata>

<id>Microsoft.CommonDataModel.ObjectModel.Adapter.Syms</id>
<version>1.3.0-preview1</version>
<description>The Syms adapter implementation for the Microsoft Common Data Model Object Model.</description>

<authors>Microsoft</authors>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<license type="expression">MS-PL AND MS-RL AND Apache-2.0</license>
<projectUrl>https://commondatamodel.visualstudio.com/CDM</projectUrl>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<repository url="https://commondatamodel.visualstudio.com/CDM/_git/CDM.ObjectModel" />
<tags>CommonDataModel CDM</tags>
<language>en-US</language>

<dependencies>
<group targetFramework=".NETFramework4.5">
<dependency id="Microsoft.CSharp" version="4.5.0" />
<dependency id="Microsoft.Identity.Client" version="4.29.0" />
<dependency id="Newtonsoft.Json" version="12.0.2" />
</group>
<group targetFramework=".NETFramework4.6.2">
<dependency id="Microsoft.CSharp" version="4.5.0" />
<dependency id="Microsoft.Identity.Client" version="4.29.0" />
<dependency id="Newtonsoft.Json" version="12.0.2" />
</group>
<group targetFramework=".NETStandard2.0">
<dependency id="Microsoft.CSharp" version="4.5.0" />
<dependency id="Microsoft.Identity.Client" version="4.29.0" />
<dependency id="Newtonsoft.Json" version="12.0.2" />
</group>
</dependencies>

</metadata>

<files>
<file src="..\Microsoft.CommonDataModel.ObjectModel.Adapter.Syms\bin\Release\net45\Microsoft.CommonDataModel.ObjectModel.Adapter.Syms.dll" target="lib\net45\Microsoft.CommonDataModel.ObjectModel.Adapter.Syms.dll" />

<file src="..\Microsoft.CommonDataModel.ObjectModel.Adapter.Syms\bin\Release\net462\Microsoft.CommonDataModel.ObjectModel.Adapter.Syms.dll" target="lib\net462\Microsoft.CommonDataModel.ObjectModel.Adapter.Syms.dll" />

<file src="..\Microsoft.CommonDataModel.ObjectModel.Adapter.Syms\bin\Release\netstandard2.0\Microsoft.CommonDataModel.ObjectModel.Adapter.Syms.dll" target="lib\netstandard2.0\Microsoft.CommonDataModel.ObjectModel.Adapter.Syms.dll" />
</files>

</package>
Loading