Skip to content
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

Jump to bottom

Update nuget packages, MonoAndroid9, Xamarin 28, XForms 3.x #838

Merged
merged 11 commits into from
Feb 8, 2019
Merged

Update nuget packages, MonoAndroid9, Xamarin 28, XForms 3.x #838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5748d64
update to android 9 compiles
MarkZuber Jan 25, 2019
992bb12
fixes
MarkZuber Jan 26, 2019
f74795b
remove 2019 flag from sln
MarkZuber Jan 26, 2019
8ff52c7
pr feedback
MarkZuber Jan 28, 2019
8cf6864
Merge branch 'dev3x' into markzuber/nugetupdate
MarkZuber Jan 29, 2019
93425b4
progress
MarkZuber Feb 1, 2019
ae613bc
Merge branch 'dev3x' into markzuber/nugetupdate
MarkZuber Feb 7, 2019
c811bc5
update sln dependencies so dll and ref dll don't build at same time
MarkZuber Feb 8, 2019
b99077c
Merge branch 'dev3x' into markzuber/nugetupdate
MarkZuber Feb 8, 2019
ddc2a07
add a few more dependencies for xamarin build order
MarkZuber Feb 8, 2019
c9662e7
package updates
MarkZuber Feb 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 2 additions & 5 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@
For clarity, without PrivateAssets marked here, anyone consuming Microsoft.Identity.Client
would also be forced to install these dependencies. PrivateAssets avoids this problem. -->
<PackageReference Include="AsyncUsageAnalyzers" Version="1.0.0-alpha003" PrivateAssets="All" />
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2" PrivateAssets="All" />
<PackageReference Include="StrongNamer" Version="0.0.8" PrivateAssets="All" Condition="$([MSBuild]::IsOsPlatform('Windows')) " />
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.3" PrivateAssets="All" />
<PackageReference Include="StrongNamer" Version="0.0.8" PrivateAssets="All" Condition="$([MSBuild]::IsOsPlatform('Windows')) " />
</ItemGroup>



</Project>
10 changes: 10 additions & 0 deletions LibsAndSamples.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9B0B5396-4D95-4C15-82ED-DC22B5A3123F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Identity.Client", "src\Microsoft.Identity.Client\Microsoft.Identity.Client.csproj", "{60117A9B-4BB8-472E-BFFF-52CBF67CA95A}"
ProjectSection(ProjectDependencies) = postProject
{A1BDB0D8-A1F8-4203-A95F-31D0ABC4DF7B} = {A1BDB0D8-A1F8-4203-A95F-31D0ABC4DF7B}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "automation", "automation", "{F578B51B-9A88-4230-A05A-DB5A23FABB07}"
EndProject
Expand All @@ -18,8 +21,14 @@ EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XForms", "tests\devapps\XForms\XForms\XForms.csproj", "{8D14A8FF-6CB9-44B1-B7C4-3C1D79CE8412}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XForms.Android", "tests\devapps\XForms\XForms.Android\XForms.Android.csproj", "{6120F6A0-59BA-4065-B0F4-92690D9BE1E2}"
ProjectSection(ProjectDependencies) = postProject
{146ECCB6-C3F1-4E97-BC52-20FEB7785C62} = {146ECCB6-C3F1-4E97-BC52-20FEB7785C62}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XForms.iOS", "tests\devapps\XForms\XForms.iOS\XForms.iOS.csproj", "{146ECCB6-C3F1-4E97-BC52-20FEB7785C62}"
ProjectSection(ProjectDependencies) = postProject
{0B22271B-163F-429B-A472-4C7BF531CEE9} = {0B22271B-163F-429B-A472-4C7BF531CEE9}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XForms.UWP", "tests\devapps\XForms\XForms.UWP\XForms.UWP.csproj", "{0B22271B-163F-429B-A472-4C7BF531CEE9}"
EndProject
Expand All @@ -39,6 +48,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UWP", "tests\devapps\UWP\UW
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{E19B0572-BBD7-424E-81D5-E59E6884EB3A}"
ProjectSection(SolutionItems) = preProject
Directory.Build.props = Directory.Build.props
src\Directory.Build.targets = src\Directory.Build.targets
src\MSAL.Common.props = src\MSAL.Common.props
src\MSAL.Frameworks.props = src\MSAL.Frameworks.props
Expand Down
3 changes: 3 additions & 0 deletions LibsNoSamples.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Identity.Test.UIAutomation.Infrastructure", "tests\Microsoft.Identity.Test.Core.UIAutomation\Microsoft.Identity.Test.UIAutomation.Infrastructure.csproj", "{3DC6EC76-D350-4D43-B206-A4CEC8AA36D4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Identity.Client", "src\Microsoft.Identity.Client\Microsoft.Identity.Client.csproj", "{60117A9B-4BB8-472E-BFFF-52CBF67CA95A}"
ProjectSection(ProjectDependencies) = postProject
{528C5488-C0D8-45C3-BEAC-3E52C22631C9} = {528C5488-C0D8-45C3-BEAC-3E52C22631C9}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
4 changes: 2 additions & 2 deletions samples/desktop/SampleApp/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
</configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
44 changes: 18 additions & 26 deletions samples/desktop/SampleApp/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 9 additions & 13 deletions samples/desktop/SampleApp/Properties/Settings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion samples/desktop/SampleApp/SampleApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@
<OutputType>WinExe</OutputType>
<RootNamespace>SampleApp</RootNamespace>
<AssemblyName>SampleApp</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand Down
21 changes: 12 additions & 9 deletions src/MSAL.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
<!--This will generate AssemblyVersion, AssemblyFileVersion and AssemblyInformationVersion-->
<Version>$(MsalClientSemVer)</Version>

<XamarinAndroidSupportSkipVerifyVersions>true</XamarinAndroidSupportSkipVerifyVersions>

<!-- Copyright needs to be in the form of © not (c) to be compliant -->
<Title>Microsoft Authentication Library for .NET</Title>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
Expand Down Expand Up @@ -62,6 +64,7 @@
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
<AndroidResgenClass>Resource</AndroidResgenClass>
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNetDesktop)'">
<DefineConstants>$(DefineConstants);DESKTOP</DefineConstants>
Expand Down Expand Up @@ -102,7 +105,7 @@
<PackageReference Include="System.Xml.XDocument" Version="4.3.0" />
<PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.0" />
<PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
<PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
<PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
<PackageReference Include="System.Runtime.Serialization.Formatters" Version="4.3.0" />
<PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
<PackageReference Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
Expand All @@ -117,7 +120,7 @@
<PackageReference Include="System.Runtime.Serialization.Json" Version="4.3.0" />
<PackageReference Include="System.Xml.XDocument" Version="4.3.0" />
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
<PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
<PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
<PackageReference Include="System.Security.SecureString" Version="4.3.0" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == '$(TargetFrameworkNetDesktop)' ">
Expand All @@ -141,7 +144,7 @@
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkUap)' ">
<Compile Include="$(PathToMsalSources)\Platforms\uap\**\*.cs" />
<PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
<PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
<PackageReference Include="System.Runtime.Serialization.Formatters" Version="4.3.0" />
<PackageReference Include="System.Runtime.Serialization.Json" Version="4.3.0" />
Expand All @@ -151,15 +154,15 @@
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == '$(TargetFrameworkIos)' ">
<Compile Include="$(PathToMsalSources)\Platforms\iOS\**\*.cs" />
<Compile Include="$(PathToMsalSources)\Platforms\AppleShared\**\*.cs" />
<Compile Include="$(PathToMsalSources)\Platforms\AppleShared\**\*.cs" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.IdentityModel" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
<PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
<PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
<PackageReference Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
<PackageReference Include="System.Runtime.Serialization.Formatters" Version="4.3.0" />
Expand All @@ -168,7 +171,7 @@
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == '$(TargetFrameworkMac)' ">
<Compile Include="$(PathToMsalSources)\Platforms\Mac\**\*.cs" />
<Compile Include="$(PathToMsalSources)\Platforms\AppleShared\**\*.cs" />
<Compile Include="$(PathToMsalSources)\Platforms\AppleShared\**\*.cs" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.IdentityModel" />
Expand All @@ -188,8 +191,8 @@
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
<PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="27.0.2" />
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="27.0.2" />
<PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="28.0.0.1" />
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.1" />
<PackageReference Include="System.Security.SecureString" Version="4.3.0" />
</ItemGroup>

Expand All @@ -202,7 +205,7 @@
<None Update="$(PathToMsalSources)\Platforms\net45\SilentWindowsFormsAuthenticationDialog.cs" SubType="Form" />
</ItemGroup>

<ItemGroup Label="Build Tools" Condition="$([MSBuild]::IsOsPlatform('Windows'))">
<ItemGroup Label="Build Tools" Condition="$([MSBuild]::IsOsPlatform('Windows'))">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All"/>
</ItemGroup>
</Project>
8 changes: 4 additions & 4 deletions src/MSAL.Frameworks.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<TargetFrameworkUap>uap10.0</TargetFrameworkUap>
<TargetFrameworkIos>Xamarin.iOS10</TargetFrameworkIos>
<TargetFrameworkMac>xamarinmac20</TargetFrameworkMac>
<TargetFrameworkAndroid>MonoAndroid8.1</TargetFrameworkAndroid>
<TargetFrameworkAndroid>MonoAndroid9.0</TargetFrameworkAndroid>

<TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworkNetDesktop);$(TargetFrameworkNetStandard);$(TargetFrameworkNetCore);$(TargetFrameworkUap);$(TargetFrameworkIos);$(TargetFrameworkAndroid);$(TargetFrameworkMac)</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('OSX'))">$(TargetFrameworkNetStandard);$(TargetFrameworkNetCore);$(TargetFrameworkIos);$(TargetFrameworkAndroid);$(TargetFrameworkMac)</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Linux'))">$(TargetFrameworkNetStandard);$(TargetFrameworkNetCore);</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworkNetDesktop);$(TargetFrameworkNetStandard);$(TargetFrameworkNetCore);$(TargetFrameworkUap);$(TargetFrameworkIos);$(TargetFrameworkAndroid);$(TargetFrameworkMac)</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('OSX'))">$(TargetFrameworkNetStandard);$(TargetFrameworkNetCore);$(TargetFrameworkIos);$(TargetFrameworkAndroid);$(TargetFrameworkMac)</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Linux'))">$(TargetFrameworkNetStandard);$(TargetFrameworkNetCore);</TargetFrameworks>

</PropertyGroup>
</Project>
4 changes: 0 additions & 4 deletions src/Microsoft.Identity.Client.Ref/Microsoft.Identity.Client.Ref.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,4 @@
<PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNetStandard)'">
<DefineConstants>$(DefineConstants);NETSTANDARD_BUILDTIME</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
</ItemGroup>

</Project>
4 changes: 4 additions & 0 deletions src/Microsoft.Identity.Client/Microsoft.Identity.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<Project Sdk="MSBuild.Sdk.Extras">
<Import Project="../MSAL.Frameworks.props" />

<!-- Platform flags, NuGet metadata properties and versioning properties are in Directory.Build.props -->
<Import Project="../MSAL.Common.props" />
<PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNetCore)' ">
Expand All @@ -23,4 +24,7 @@
<ItemGroup>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can't we place these in the common.props file?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nuget doesn't put them there when doing a package update. we can talk about moving them, but that means we have to do that every time we update our packages.

In reply to: 251941091 [](ancestors = 251941091)

<ReferenceAssemblyProjectReference Include="..\Microsoft.Identity.Client.Ref\Microsoft.Identity.Client.Ref.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.3" />
</ItemGroup>
</Project>
32 changes: 9 additions & 23 deletions tests/CacheCompat/CommonCache.Test.AdalV3/CommonCache.Test.AdalV3.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,15 @@
<LangVersion>7.1</LangVersion>
</PropertyGroup>
<ItemGroup>
<Reference Include="CommandLine, Version=2.3.0.0, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\CommandLineParser.2.3.0\lib\net45\CommandLine.dll</HintPath>
</Reference>
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=3.19.8.16603, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.19.8\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
</Reference>
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform, Version=3.19.8.16603, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.19.8\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<PackageReference Include="CommandLineParser">
<Version>2.4.3</Version>
</PackageReference>
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory">
<Version>3.19.8</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>12.0.1</Version>
</PackageReference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
Expand All @@ -76,16 +73,5 @@
<Name>CommonCache.Test.Common</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="CommandLineParser">
<Version>2.3.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory">
<Version>3.19.8</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>12.0.1</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>