Skip to content

Commit e4983af

Browse files
JeavonJeavon
committed
Add transforms for Umbraco package to add assembly redirects for the Microsoft.WindowsAzure.Storage package and it's dependencies :( I pray one day this won't be needed
1 parent 16d8d1c commit e4983af

File tree

5 files changed

+65
-1
lines changed

5 files changed

+65
-1
lines changed

‎build/UmbracoFileSystemProviders.Azure.proj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@
124124
<BinFiles Include="$(ProjectDir)\bin\$(BuildConfig)\Our.Umbraco.FileSystemProviders.Azure.dll" />
125125
<PdbFiles Include="$(ProjectDir)\bin\$(BuildConfig)\Our.Umbraco.FileSystemProviders.Azure.pdb" />
126126
<WebConfigXDTFiles Include="$(MSBuildProjectDirectory)\transforms\web.config.*.xdt" />
127+
<UmbPakWebConfigXDTFiles Include="$(MSBuildProjectDirectory)\transforms\umbpak-web.config.*.xdt" />
127128
<FileSystemProvidersConfigXDTInstallFile Include="$(MSBuildProjectDirectory)\transforms\FileSystemProviders.config.install.xdt" />
128129

129130
<!-- The FileSystemProviders.config.uninstall.xdt needs to be excluded from the NuGet package so that upgrades don't overwrite parameter values due to NuGet upgrades actually executing uninstall/install -->
@@ -153,6 +154,7 @@
153154
<Copy SourceFiles="@(InstallerBinFiles)" DestinationFolder="$(BuildUmbDir)\bin" />
154155
<Copy SourceFiles="@(UmbracoOtherBinFiles)" DestinationFolder="$(BuildUmbDir)\bin" />
155156
<Copy SourceFiles="@(WebConfigXDTFiles)" DestinationFolder="$(BuildUmbDir)\App_Plugins\UmbracoFileSystemProviders\Azure\Install" />
157+
<Copy SourceFiles="@(UmbPakWebConfigXDTFiles)" DestinationFolder="$(BuildUmbDir)\App_Plugins\UmbracoFileSystemProviders\Azure\Install" />
156158
<Copy SourceFiles="@(MediaWebConfigXDTInstallFile)" DestinationFolder="$(BuildUmbDir)\App_Plugins\UmbracoFileSystemProviders\Azure\Install" />
157159
<Copy SourceFiles="@(MediaWebConfigXDTUninstallFile)" DestinationFolder="$(BuildUmbDir)\App_Plugins\UmbracoFileSystemProviders\Azure\Install" />
158160

‎build/package.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<DataTypes />
3030

3131
<Actions>
32+
<Action runat="install" undo="true" alias="UmbracoFileSystemProviders.Azure.TransformConfig" file="~/web.config" xdtfile="~/App_Plugins/UmbracoFileSystemProviders/Azure/Install/umbpak-web.config"></Action>
3233
<Action runat="uninstall" undo="true" alias="UmbracoFileSystemProviders.Azure.TransformConfig" file="~/web.config" xdtfile="~/App_Plugins/UmbracoFileSystemProviders/Azure/Install/web.config"></Action>
3334
<Action runat="uninstall" undo="true" alias="UmbracoFileSystemProviders.Azure.TransformConfig" file="~/Config/FileSystemProviders.config" xdtfile="~/App_Plugins/UmbracoFileSystemProviders/Azure/Install/FileSystemProviders.config"></Action>
3435
<Action runat="uninstall" undo="true" alias="UmbracoFileSystemProviders.Azure.TransformConfig" file="~/Media/web.config" xdtfile="~/App_Plugins/UmbracoFileSystemProviders/Azure/Install/media-web.config"></Action>

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

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<?xml version="1.0"?>
2+
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" xdt:Transform="InsertIfMissing">
5+
6+
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.WindowsAzure.Storage')">
7+
</dependentAssembly>
8+
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.Services.Client')">
9+
</dependentAssembly>
10+
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.OData')">
11+
</dependentAssembly>
12+
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.Edm')">
13+
</dependentAssembly>
14+
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Azure.KeyVault.Core')">
15+
</dependentAssembly>
16+
17+
<dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.WindowsAzure.Storage')">
18+
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
19+
<bindingRedirect oldVersion="0.0.0.0-8.7.0.0" newVersion="8.7.0.0" xdt:Transform="SetAttributes" />
20+
</dependentAssembly>
21+
<dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.Services.Client')">
22+
<assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
23+
<bindingRedirect oldVersion="0.0.0.0-5.8.3.0" newVersion="5.8.3.0" xdt:Transform="SetAttributes" />
24+
</dependentAssembly>
25+
<dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.OData')">
26+
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
27+
<bindingRedirect oldVersion="0.0.0.0-5.8.3.0" newVersion="5.8.3.0" xdt:Transform="SetAttributes" />
28+
</dependentAssembly>
29+
<dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.Edm')">
30+
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
31+
<bindingRedirect oldVersion="0.0.0.0-5.8.3.0" newVersion="5.8.3.0" xdt:Transform="SetAttributes" />
32+
</dependentAssembly>
33+
<dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Azure.KeyVault.Core')">
34+
<assemblyIdentity name="Microsoft.Azure.KeyVault.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
35+
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" xdt:Transform="SetAttributes" />
36+
</dependentAssembly>
37+
</assemblyBinding>
38+
</runtime>
39+
</configuration>

‎build/transforms/umbpak-web.config.uninstall.xdt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0"?>
2+
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.WindowsAzure.Storage')">
6+
</dependentAssembly>
7+
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.Services.Client')">
8+
</dependentAssembly>
9+
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.OData')">
10+
</dependentAssembly>
11+
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.Edm')">
12+
</dependentAssembly>
13+
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Azure.KeyVault.Core')">
14+
</dependentAssembly>
15+
</assemblyBinding>
16+
</runtime>
17+
</configuration>

‎src/UmbracoFileSystemProviders.Azure.sln

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26430.16
4+
VisualStudioVersion = 15.0.27004.2008
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UmbracoFileSystemProviders.Azure", "UmbracoFileSystemProviders.Azure\UmbracoFileSystemProviders.Azure.csproj", "{749BC432-144A-4250-9066-D1FE170AFE42}"
77
EndProject
@@ -26,6 +26,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BuildPackage", "BuildPackag
2626
..\build\package.proj = ..\build\package.proj
2727
..\build\package.xml = ..\build\package.xml
2828
..\build\transforms\security.config.install.xdt = ..\build\transforms\security.config.install.xdt
29+
..\build\transforms\umbpak-web.config.install.xdt = ..\build\transforms\umbpak-web.config.install.xdt
30+
..\build\transforms\umbpak-web.config.uninstall.xdt = ..\build\transforms\umbpak-web.config.uninstall.xdt
2931
..\build\UmbracoFileSystemProviders.Azure.proj = ..\build\UmbracoFileSystemProviders.Azure.proj
3032
..\build\transforms\web.config.install.xdt = ..\build\transforms\web.config.install.xdt
3133
..\build\transforms\web.config.uninstall.xdt = ..\build\transforms\web.config.uninstall.xdt
@@ -55,4 +57,7 @@ Global
5557
GlobalSection(SolutionProperties) = preSolution
5658
HideSolutionNode = FALSE
5759
EndGlobalSection
60+
GlobalSection(ExtensibilityGlobals) = postSolution
61+
SolutionGuid = {3AE84ED2-4474-40A2-AE68-0FB12C21CC46}
62+
EndGlobalSection
5863
EndGlobal

0 commit comments

Comments
 (0)