Skip to content

Commit 72cc7c4

Browse files
committed
Adding new dependant assemblies for Umbraco package
1 parent f36a59e commit 72cc7c4

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

build/UmbracoFileSystemProviders.Azure.Forms.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<PackageName>UmbracoFileSystemProviders.Azure.Forms</PackageName>
1919
<MinUmbracoVersion>8.1.0</MinUmbracoVersion>
2020
<Readme>An Azure Blob Storage IFileSystem provider for Umbraco Forms files.</Readme>
21-
<AuthorName>James Jackson-South, Dirk Seefeld, Lars-Erik Aabech, Jeavon Leopold</AuthorName>
21+
<AuthorName>James Jackson-South, Dirk Seefeld, Lars-Erik Aabech, Jeavon Leopold, Warren Buckley, Callum Whyte, Sebastiaan Janssen, Rachel Breeze, Shannon Deminick, Chad Currie</AuthorName>
2222
<AuthorUrl>https://github.com/umbraco-community/UmbracoFileSystemProviders.Azure/graphs/contributors</AuthorUrl>
2323
<PackageLicenseName>Apache 2.0 license</PackageLicenseName>
2424
<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>

build/UmbracoFileSystemProviders.Azure.Media.proj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<PackageName>UmbracoFileSystemProviders.Azure.Media</PackageName>
1919
<MinUmbracoVersion>8.1.0</MinUmbracoVersion>
2020
<Readme>An Azure Blob Storage IFileSystem provider for Umbraco Media.</Readme>
21-
<AuthorName>James Jackson-South, Dirk Seefeld, Lars-Erik Aabech, Jeavon Leopold</AuthorName>
21+
<AuthorName>James Jackson-South, Dirk Seefeld, Lars-Erik Aabech, Jeavon Leopold, Warren Buckley, Callum Whyte, Sebastiaan Janssen, Rachel Breeze, Shannon Deminick, Chad Currie</AuthorName>
2222
<AuthorUrl>https://github.com/umbraco-community/UmbracoFileSystemProviders.Azure/graphs/contributors</AuthorUrl>
2323
<PackageLicenseName>Apache 2.0 license</PackageLicenseName>
2424
<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
@@ -88,7 +88,7 @@
8888
<!-- Umbraco specific -->
8989
<!-- Newtonsoft.Json Excluded for now as Umbraco requires different major versions -->
9090
<CoreBinFiles Include="$(CoreProjectDir)\bin\$(BuildConfig)\Our.Umbraco.FileSystemProviders.Azure.dll" />
91-
<UmbracoOtherBinFiles Include="$(InstallerProjectDir)\bin\$(BuildConfig)\Microsoft.Web.XmlTransform.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Microsoft.Data.Edm.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Microsoft.Data.OData.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Azure.Storage.Blobs.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Azure.Storage.Common.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Azure.Core.dll;$(CoreProjectDir)\bin\$(BuildConfig)\System.Spatial.dll" />
91+
<UmbracoOtherBinFiles Include="$(InstallerProjectDir)\bin\$(BuildConfig)\Microsoft.Web.XmlTransform.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Microsoft.Data.Edm.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Microsoft.Data.OData.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Azure.Storage.Blobs.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Azure.Storage.Common.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Azure.Core.dll;$(CoreProjectDir)\bin\$(BuildConfig)\System.Spatial.dll;$(CoreProjectDir)\bin\$(BuildConfig)\System.Memory.Data.dll;$(CoreProjectDir)\bin\$(BuildConfig)\System.Text.Encodings.Web.dll;$(CoreProjectDir)\bin\$(BuildConfig)\System.Text.Json.dll" />
9292
<InstallerBinFiles Include="$(InstallerProjectDir)\bin\$(BuildConfig)\Our.Umbraco.FileSystemProviders.Azure.Installer.dll" />
9393
<UmbracoInstallerFiles Include="$(InstallerProjectDir)\Configurator\**\*.*"/>
9494
<UmbracoInstallerLogo Include="$(MSBuildProjectDirectory)\assets\logo\azure-logo-32.png"/>

build/transforms/umbpak-web.config.install.xdt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
</dependentAssembly>
99
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Azure.Core')">
1010
</dependentAssembly>
11+
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Text.Encodings.Web')">
12+
</dependentAssembly>
1113

1214
<dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.OData')">
1315
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -18,9 +20,13 @@
1820
<bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0" xdt:Transform="SetAttributes" />
1921
</dependentAssembly>
2022
<dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Azure.Core')">
21-
<assemblyIdentity name="Azure.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
23+
<assemblyIdentity name="Azure.Core" publicKeyToken="92742159e12e44c8" culture="neutral" />
2224
<bindingRedirect oldVersion="0.0.0.0-1.18.0.0" newVersion="1.18.0.0" xdt:Transform="SetAttributes" />
2325
</dependentAssembly>
26+
<dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Text.Encodings.Web')">
27+
<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
28+
<bindingRedirect oldVersion="0.0.0.0-4.0.5.1" newVersion="4.0.5.1" xdt:Transform="SetAttributes" />
29+
</dependentAssembly>
2430
</assemblyBinding>
2531
</runtime>
2632
</configuration>

0 commit comments

Comments
 (0)