Merge branch 'main' of github.com:Brightscout/mattermost-outlook-pres…

…ence-provider into main
mattermost-community · Jul 11, 2022 · 47c48c8 · 47c48c8
2 parents 11a5922 + 257aec6
commit 47c48c8
Show file tree

Hide file tree

Showing 7 changed files with 429 additions and 565 deletions.
diff --git a/MMPresenceProvider.sln b/MMPresenceProvider.sln
@@ -9,7 +9,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OutOfProcessCOMBase", "OutO
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MMPresenceProviderImpl", "MMPresenceProviderImpl\MMPresenceProviderImpl.csproj", "{034E0472-A9D5-4E8C-890F-A8E7C26911BE}"
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "MMPresenceProviderSetup", "MMPresenceProviderSetup\MMPresenceProviderSetup.vdproj", "{9FF31714-17E2-42E1-8703-E67A6F92DEDA}"
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "MMPresenceProviderSetup", "MMPresenceProviderSetup\MMPresenceProviderSetup.vdproj", "{01E8A337-D261-45E8-A5E2-DA2B9F15C372}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -57,13 +57,13 @@ Global
 		{034E0472-A9D5-4E8C-890F-A8E7C26911BE}.Release|x64.Build.0 = Release|Any CPU
 		{034E0472-A9D5-4E8C-890F-A8E7C26911BE}.Release|x86.ActiveCfg = Release|Any CPU
 		{034E0472-A9D5-4E8C-890F-A8E7C26911BE}.Release|x86.Build.0 = Release|Any CPU
-		{9FF31714-17E2-42E1-8703-E67A6F92DEDA}.Debug|Any CPU.ActiveCfg = Debug
-		{9FF31714-17E2-42E1-8703-E67A6F92DEDA}.Debug|x64.ActiveCfg = Debug
-		{9FF31714-17E2-42E1-8703-E67A6F92DEDA}.Debug|x86.ActiveCfg = Debug
-		{9FF31714-17E2-42E1-8703-E67A6F92DEDA}.Release|Any CPU.ActiveCfg = Release
-		{9FF31714-17E2-42E1-8703-E67A6F92DEDA}.Release|Any CPU.Build.0 = Release
-		{9FF31714-17E2-42E1-8703-E67A6F92DEDA}.Release|x64.ActiveCfg = Release
-		{9FF31714-17E2-42E1-8703-E67A6F92DEDA}.Release|x86.ActiveCfg = Release
+		{01E8A337-D261-45E8-A5E2-DA2B9F15C372}.Debug|Any CPU.ActiveCfg = Debug
+		{01E8A337-D261-45E8-A5E2-DA2B9F15C372}.Debug|x64.ActiveCfg = Debug
+		{01E8A337-D261-45E8-A5E2-DA2B9F15C372}.Debug|x86.ActiveCfg = Debug
+		{01E8A337-D261-45E8-A5E2-DA2B9F15C372}.Release|Any CPU.ActiveCfg = Release
+		{01E8A337-D261-45E8-A5E2-DA2B9F15C372}.Release|Any CPU.Build.0 = Release
+		{01E8A337-D261-45E8-A5E2-DA2B9F15C372}.Release|x64.ActiveCfg = Release
+		{01E8A337-D261-45E8-A5E2-DA2B9F15C372}.Release|x86.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/MMPresenceProvider/MMPresenceProvider.csproj b/MMPresenceProvider/MMPresenceProvider.csproj
@@ -88,9 +88,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Installer.cs">
-      <SubType>Component</SubType>
-    </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Startup.cs" />

diff --git a/MMPresenceProvider/app.config b/MMPresenceProvider/app.config
@@ -11,7 +11,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.3" newVersion="6.0.0.3" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.4" newVersion="6.0.0.4" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />

diff --git a/MMPresenceProviderImpl/MMPresenceProviderImpl.csproj b/MMPresenceProviderImpl/MMPresenceProviderImpl.csproj
@@ -62,8 +62,8 @@
     <Reference Include="System.Text.Encodings.Web, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Text.Encodings.Web.6.0.0\lib\net461\System.Text.Encodings.Web.dll</HintPath>
     </Reference>
-    <Reference Include="System.Text.Json, Version=6.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Json.6.0.3\lib\net461\System.Text.Json.dll</HintPath>
+    <Reference Include="System.Text.Json, Version=6.0.0.4, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Json.6.0.4\lib\net461\System.Text.Json.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Channels, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Threading.Channels.6.0.0\lib\net461\System.Threading.Channels.dll</HintPath>
@@ -122,12 +122,12 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\System.Text.Json.6.0.3\build\System.Text.Json.targets" Condition="Exists('..\packages\System.Text.Json.6.0.3\build\System.Text.Json.targets')" />
+  <Import Project="..\packages\System.Text.Json.6.0.4\build\System.Text.Json.targets" Condition="Exists('..\packages\System.Text.Json.6.0.4\build\System.Text.Json.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\System.Text.Json.6.0.3\build\System.Text.Json.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Text.Json.6.0.3\build\System.Text.Json.targets'))" />
+    <Error Condition="!Exists('..\packages\System.Text.Json.6.0.4\build\System.Text.Json.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Text.Json.6.0.4\build\System.Text.Json.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/MMPresenceProviderImpl/app.config b/MMPresenceProviderImpl/app.config
@@ -8,7 +8,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.3" newVersion="6.0.0.3" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.4" newVersion="6.0.0.4" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />

diff --git a/MMPresenceProviderImpl/packages.config b/MMPresenceProviderImpl/packages.config
@@ -8,7 +8,7 @@
   <package id="System.Reactive" version="5.0.0" targetFramework="net48" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" />
   <package id="System.Text.Encodings.Web" version="6.0.0" targetFramework="net48" />
-  <package id="System.Text.Json" version="6.0.3" targetFramework="net48" />
+  <package id="System.Text.Json" version="6.0.4" targetFramework="net48" />
   <package id="System.Threading.Channels" version="6.0.0" targetFramework="net48" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net48" />