Skip to content

Commit 990facd

Browse files
jmprieurjmprieur
authored
Merge pull request #70 from Azure-Samples/markzuber/msal410
update to msal4.1.0
2 parents 20bfaed + bb2066b commit 990facd

File tree

7 files changed

+25
-43
lines changed

7 files changed

+25
-43
lines changed

‎1. Desktop app calls Web API/TodoListClient/TodoListClient.csproj‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,6 @@
3636
<WarningLevel>4</WarningLevel>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="Microsoft.Identity.Client, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Microsoft.Identity.Client.4.0.0\lib\net45\Microsoft.Identity.Client.dll</HintPath>
41-
</Reference>
42-
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
43-
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
44-
</Reference>
4539
<Reference Include="System" />
4640
<Reference Include="System.Configuration" />
4741
<Reference Include="System.Data" />
@@ -102,9 +96,6 @@
10296
<Generator>ResXFileCodeGenerator</Generator>
10397
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
10498
</EmbeddedResource>
105-
<None Include="packages.config">
106-
<SubType>Designer</SubType>
107-
</None>
10899
<None Include="Properties\Settings.settings">
109100
<Generator>SettingsSingleFileGenerator</Generator>
110101
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -116,6 +107,14 @@
116107
<SubType>Designer</SubType>
117108
</None>
118109
</ItemGroup>
110+
<ItemGroup>
111+
<PackageReference Include="Microsoft.Identity.Client">
112+
<Version>4.1.0</Version>
113+
</PackageReference>
114+
<PackageReference Include="Newtonsoft.Json">
115+
<Version>11.0.2</Version>
116+
</PackageReference>
117+
</ItemGroup>
119118
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
120119
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
121120
Other similar extension points exist, see Microsoft.Common.targets.

‎1. Desktop app calls Web API/TodoListClient/packages.config‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎2. Web API now calls Microsoft Graph/TodoListClient/TodoListClient.csproj‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,6 @@
3636
<WarningLevel>4</WarningLevel>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="Microsoft.Identity.Client, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Microsoft.Identity.Client.4.0.0\lib\net45\Microsoft.Identity.Client.dll</HintPath>
41-
</Reference>
42-
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
43-
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
44-
</Reference>
4539
<Reference Include="System" />
4640
<Reference Include="System.Configuration" />
4741
<Reference Include="System.Data" />
@@ -102,9 +96,6 @@
10296
<Generator>ResXFileCodeGenerator</Generator>
10397
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
10498
</EmbeddedResource>
105-
<None Include="packages.config">
106-
<SubType>Designer</SubType>
107-
</None>
10899
<None Include="Properties\Settings.settings">
109100
<Generator>SettingsSingleFileGenerator</Generator>
110101
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -116,6 +107,14 @@
116107
<SubType>Designer</SubType>
117108
</None>
118109
</ItemGroup>
110+
<ItemGroup>
111+
<PackageReference Include="Microsoft.Identity.Client">
112+
<Version>4.1.0</Version>
113+
</PackageReference>
114+
<PackageReference Include="Newtonsoft.Json">
115+
<Version>11.0.2</Version>
116+
</PackageReference>
117+
</ItemGroup>
119118
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
120119
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
121120
Other similar extension points exist, see Microsoft.Common.targets.

‎2. Web API now calls Microsoft Graph/TodoListClient/packages.config‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎3.-Web-api-call-Microsoft-graph-for-personal-accounts/TodoListClient/TodoListClient.csproj‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,6 @@
3636
<WarningLevel>4</WarningLevel>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="Microsoft.Identity.Client, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Microsoft.Identity.Client.4.0.0\lib\net45\Microsoft.Identity.Client.dll</HintPath>
41-
</Reference>
42-
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
43-
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
44-
</Reference>
4539
<Reference Include="System" />
4640
<Reference Include="System.Configuration" />
4741
<Reference Include="System.Data" />
@@ -102,9 +96,6 @@
10296
<Generator>ResXFileCodeGenerator</Generator>
10397
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
10498
</EmbeddedResource>
105-
<None Include="packages.config">
106-
<SubType>Designer</SubType>
107-
</None>
10899
<None Include="Properties\Settings.settings">
109100
<Generator>SettingsSingleFileGenerator</Generator>
110101
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -116,6 +107,14 @@
116107
<SubType>Designer</SubType>
117108
</None>
118109
</ItemGroup>
110+
<ItemGroup>
111+
<PackageReference Include="Microsoft.Identity.Client">
112+
<Version>4.1.0</Version>
113+
</PackageReference>
114+
<PackageReference Include="Newtonsoft.Json">
115+
<Version>11.0.2</Version>
116+
</PackageReference>
117+
</ItemGroup>
119118
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
120119
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
121120
Other similar extension points exist, see Microsoft.Common.targets.

‎3.-Web-api-call-Microsoft-graph-for-personal-accounts/TodoListClient/packages.config‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎Microsoft.Identity.Web/Microsoft.Identity.Web.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
<ItemGroup>
88
<PackageReference Include="Microsoft.AspNetCore.App" />
99
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="2.2.0" />
10-
<PackageReference Include="Microsoft.Identity.Client" Version="4.0.0" />
10+
<PackageReference Include="Microsoft.Identity.Client" Version="4.1.0" />
1111
</ItemGroup>
1212
</Project>

0 commit comments

Comments
 (0)