Skip to content

Commit 4273153

Browse files
aurnoraurnor
authored
Merge pull request #8 from lgmorand/feature/updateMSGraph
Upgrade to .NET Framework 4.8 and update dependencies
2 parents 93070a5 + dbe5055 commit 4273153

File tree

8 files changed

+305
-36
lines changed

8 files changed

+305
-36
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ The program can:
1818

1919
- add contacts : add contacts who are subordinates of the defined alias(es) / add members of the defined distribution list or security group
2020
- update contacts : it will update the information for the contacts previously imported
21-
- delete duplicate : delete previously imported contacts which are not in the directory anymore
21+
- delete orphans : delete previously imported contacts which are not in the directory anymore
2222

2323
> /!\ All managed contacts are marked in the category "Ms Staff v2" and others contacts will remain untouched
2424
2525
## Compatibility
2626

27-
The program has been tested against Office 2016 *(32 bits and 64 bits)* and requires the minimum version of .Net framework 4.5.2
27+
The program has been tested against Office 2016 *(32 bits and 64 bits)* and requires the minimum version of .Net framework 4.8
2828

2929
## Known issues and solution
3030

‎src/Microsoft.Internal.MSContactImporter/App.config‎

Lines changed: 95 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
44
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -7,7 +7,7 @@
77
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
88
</configSections>
99
<startup>
10-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
10+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
1111
</startup>
1212
<log4net>
1313
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
@@ -54,4 +54,96 @@
5454
</setting>
5555
</Microsoft.Internal.MSContactImporter.Properties.Settings>
5656
</userSettings>
57-
</configuration>
57+
<runtime>
58+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
59+
<dependentAssembly>
60+
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
61+
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
62+
</dependentAssembly>
63+
<dependentAssembly>
64+
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
65+
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
66+
</dependentAssembly>
67+
<dependentAssembly>
68+
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
69+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
70+
</dependentAssembly>
71+
<dependentAssembly>
72+
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
73+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.3" newVersion="8.0.0.3" />
74+
</dependentAssembly>
75+
<dependentAssembly>
76+
<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
77+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
78+
</dependentAssembly>
79+
<dependentAssembly>
80+
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
81+
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
82+
</dependentAssembly>
83+
<dependentAssembly>
84+
<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
85+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
86+
</dependentAssembly>
87+
<dependentAssembly>
88+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
89+
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
90+
</dependentAssembly>
91+
<dependentAssembly>
92+
<assemblyIdentity name="Microsoft.Graph.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
93+
<bindingRedirect oldVersion="0.0.0.0-3.1.12.0" newVersion="3.1.12.0" />
94+
</dependentAssembly>
95+
<dependentAssembly>
96+
<assemblyIdentity name="Microsoft.Kiota.Abstractions" publicKeyToken="31bf3856ad364e35" culture="neutral" />
97+
<bindingRedirect oldVersion="0.0.0.0-1.9.6.0" newVersion="1.9.6.0" />
98+
</dependentAssembly>
99+
<dependentAssembly>
100+
<assemblyIdentity name="System.Net.Http.WinHttpHandler" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
101+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
102+
</dependentAssembly>
103+
<dependentAssembly>
104+
<assemblyIdentity name="System.Memory.Data" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
105+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
106+
</dependentAssembly>
107+
<dependentAssembly>
108+
<assemblyIdentity name="Azure.Core" publicKeyToken="92742159e12e44c8" culture="neutral" />
109+
<bindingRedirect oldVersion="0.0.0.0-1.40.0.0" newVersion="1.40.0.0" />
110+
</dependentAssembly>
111+
<dependentAssembly>
112+
<assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
113+
<bindingRedirect oldVersion="0.0.0.0-7.6.2.0" newVersion="7.6.2.0" />
114+
</dependentAssembly>
115+
<dependentAssembly>
116+
<assemblyIdentity name="Microsoft.IdentityModel.Protocols.OpenIdConnect" publicKeyToken="31bf3856ad364e35" culture="neutral" />
117+
<bindingRedirect oldVersion="0.0.0.0-7.6.2.0" newVersion="7.6.2.0" />
118+
</dependentAssembly>
119+
<dependentAssembly>
120+
<assemblyIdentity name="Microsoft.IdentityModel.Tokens" publicKeyToken="31bf3856ad364e35" culture="neutral" />
121+
<bindingRedirect oldVersion="0.0.0.0-7.6.2.0" newVersion="7.6.2.0" />
122+
</dependentAssembly>
123+
<dependentAssembly>
124+
<assemblyIdentity name="Microsoft.IdentityModel.Protocols" publicKeyToken="31bf3856ad364e35" culture="neutral" />
125+
<bindingRedirect oldVersion="0.0.0.0-7.6.2.0" newVersion="7.6.2.0" />
126+
</dependentAssembly>
127+
<dependentAssembly>
128+
<assemblyIdentity name="Microsoft.Kiota.Serialization.Form" publicKeyToken="31bf3856ad364e35" culture="neutral" />
129+
<bindingRedirect oldVersion="0.0.0.0-1.2.5.0" newVersion="1.2.5.0" />
130+
</dependentAssembly>
131+
<dependentAssembly>
132+
<assemblyIdentity name="Microsoft.IdentityModel.Abstractions" publicKeyToken="31bf3856ad364e35" culture="neutral" />
133+
<bindingRedirect oldVersion="0.0.0.0-7.6.2.0" newVersion="7.6.2.0" />
134+
</dependentAssembly>
135+
<dependentAssembly>
136+
<assemblyIdentity name="Std.UriTemplate" publicKeyToken="c118b0afb4598f9a" culture="neutral" />
137+
<bindingRedirect oldVersion="0.0.0.0-1.0.2.0" newVersion="1.0.2.0" />
138+
</dependentAssembly>
139+
<dependentAssembly>
140+
<assemblyIdentity name="System.Security.Cryptography.ProtectedData" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
141+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
142+
</dependentAssembly>
143+
<dependentAssembly>
144+
<assemblyIdentity name="System.Security.AccessControl" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
145+
<bindingRedirect oldVersion="0.0.0.0-6.0.0.1" newVersion="6.0.0.1" />
146+
</dependentAssembly>
147+
</assemblyBinding>
148+
</runtime>
149+
</configuration>

0 commit comments

Comments
 (0)