Skip to content

Commit c6628e8

Browse files
JeavonJeavon
committed
Fix build scripts for multi package build output
1 parent 78dad1d commit c6628e8

File tree

3 files changed

+83
-86
lines changed

3 files changed

+83
-86
lines changed

‎build/UmbracoFileSystemProviders.Azure.Forms.proj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@
1919
<MinUmbracoVersion>8.1.0</MinUmbracoVersion>
2020
<Readme>An Azure Blob Storage IFileSystem provider for Umbraco Forms files.</Readme>
2121
<AuthorName>James Jackson-South, Dirk Seefeld, Lars-Erik Aabech, Jeavon Leopold</AuthorName>
22-
<AuthorUrl>https://github.com/JimBobSquarePants/UmbracoFileSystemProviders.Azure/graphs/contributors</AuthorUrl>
22+
<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>
25-
<ProjectUrl>https://github.com/JimBobSquarePants/UmbracoFileSystemProviders.Azure</ProjectUrl>
25+
<ProjectUrl>https://github.com/umbraco-community/UmbracoFileSystemProviders.Azure</ProjectUrl>
2626
</PropertyGroup>
2727

2828
<!-- NUGET ONLY PROPERTIES -->
2929
<PropertyGroup>
3030
<PackageId>UmbracoFileSystemProviders.Azure.Forms</PackageId>
3131
<Copyright>Copyright &#169; James Jackson-South and contributors.</Copyright>
32-
<Owners>James Jackson-South</Owners>
32+
<Owners>James Jackson-South, Jeavon Leopold</Owners>
3333
<Description>An Azure Blob Storage IFileSystem provider for Umbraco Umbraco Forms files.</Description>
3434
<IconUrl>https://raw.githubusercontent.com/umbraco-community/UmbracoFileSystemProviders.Azure/blob/develop/build/assets/logo/azure-logo-128.png</IconUrl>
3535
<Tags>umbraco azure media blob imageprocessor forms</Tags>

‎build/UmbracoFileSystemProviders.Azure.Media.proj

Lines changed: 75 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@
1919
<MinUmbracoVersion>8.1.0</MinUmbracoVersion>
2020
<Readme>An Azure Blob Storage IFileSystem provider for Umbraco Media.</Readme>
2121
<AuthorName>James Jackson-South, Dirk Seefeld, Lars-Erik Aabech, Jeavon Leopold</AuthorName>
22-
<AuthorUrl>https://github.com/JimBobSquarePants/UmbracoFileSystemProviders.Azure/graphs/contributors</AuthorUrl>
22+
<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>
25-
<ProjectUrl>https://github.com/JimBobSquarePants/UmbracoFileSystemProviders.Azure</ProjectUrl>
25+
<ProjectUrl>https://github.com/umbraco-community/UmbracoFileSystemProviders.Azure</ProjectUrl>
2626
</PropertyGroup>
2727

2828
<!-- NUGET ONLY PROPERTIES -->
2929
<PropertyGroup>
3030
<PackageId>UmbracoFileSystemProviders.Azure.Media</PackageId>
3131
<Copyright>Copyright &#169; James Jackson-South and contributors.</Copyright>
32-
<Owners>James Jackson-South</Owners>
33-
<Description>An Azure Blob Storage IFileSystem provider for Umbraco Media. Used to offload static files in the media section to the cloud.</Description>
32+
<Owners>James Jackson-South, Jeavon Leopold</Owners>
33+
<Description>An Azure Blob Storage IFileSystem provider for Umbraco Media.</Description>
3434
<IconUrl>https://raw.githubusercontent.com/umbraco-community/UmbracoFileSystemProviders.Azure/develop/build/assets/logo/azure-logo-128.png</IconUrl>
3535
<Tags>umbraco azure media blob imageprocessor</Tags>
3636
<Language>en-GB</Language>
@@ -41,7 +41,7 @@
4141
<PropertyGroup>
4242
<FileVersion>$(mssemver)</FileVersion>
4343
</PropertyGroup>
44-
44+
4545
<!-- PATHS -->
4646
<PropertyGroup>
4747
<BuildConfig>$(CONFIGURATION)</BuildConfig>
@@ -50,7 +50,10 @@
5050
<BuildUmbDir>$(BuildDir)\_umbraco</BuildUmbDir>
5151
<BuildNuGetDir>$(BuildDir)\_nuget</BuildNuGetDir>
5252
<ArtifactsDir>$(RootDir)\artifacts</ArtifactsDir>
53-
<ProjectDir>$(RootDir)\src\UmbracoFileSystemProviders.Azure.Media</ProjectDir>
53+
<CoreProjectDir>$(RootDir)\src\UmbracoFileSystemProviders.Azure</CoreProjectDir>
54+
<MediaProjectDir>$(RootDir)\src\UmbracoFileSystemProviders.Azure.Media</MediaProjectDir>
55+
<InstallerProjectDir>$(RootDir)\src\UmbracoFileSystemProviders.Azure.Installer</InstallerProjectDir>
56+
<TestsProjectDir>$(RootDir)\src\UmbracoFileSystemProviders.Azure.Tests</TestsProjectDir>
5457
</PropertyGroup>
5558

5659
<!-- CLEAN -->
@@ -64,25 +67,56 @@
6467

6568
<!-- COMPILE -->
6669
<Target Name="Compile" DependsOnTargets="Clean">
67-
<MSBuild Projects="$(ProjectDir)\UmbracoFileSystemProviders.Azure.Media.csproj" Properties="Configuration=$(BuildConfig)" />
70+
<MSBuild Projects="$(CoreProjectDir)\UmbracoFileSystemProviders.Azure.csproj" Properties="Configuration=$(BuildConfig)" />
71+
<MSBuild Projects="$(MediaProjectDir)\UmbracoFileSystemProviders.Azure.Media.csproj" Properties="Configuration=$(BuildConfig)" />
72+
<MSBuild Projects="$(TestsProjectDir)\UmbracoFileSystemProviders.Azure.Tests.csproj" Properties="Configuration=$(BuildConfig)" />
73+
<MSBuild Projects="$(InstallerProjectDir)\UmbracoFileSystemProviders.Azure.Installer.csproj" Properties="Configuration=$(BuildConfig)" />
6874
</Target>
6975

7076
<!-- PREPARE FILES -->
7177
<Target Name="PrepareFiles" DependsOnTargets="Compile">
7278
<ItemGroup>
7379
<!-- Shared -->
74-
<BinFiles Include="$(ProjectDir)\bin\$(BuildConfig)\net472\Our.Umbraco.FileSystemProviders.Azure.Media.dll" />
75-
<PdbFiles Include="$(ProjectDir)\bin\$(BuildConfig)\net472\Our.Umbraco.FileSystemProviders.Azure.Media.pdb" />
80+
<BinFiles Include="$(MediaProjectDir)\bin\$(BuildConfig)\net472\Our.Umbraco.FileSystemProviders.Azure.Media.dll" />
81+
<PdbFiles Include="$(MediaProjectDir)\bin\$(BuildConfig)\net472\Our.Umbraco.FileSystemProviders.Azure.Media.pdb" />
7682
<WebConfigXDTFiles Include="$(MSBuildProjectDirectory)\transforms\web.config.*.xdt" />
83+
<UmbPakWebConfigXDTFiles Include="$(MSBuildProjectDirectory)\transforms\umbpak-web.config.*.xdt" />
7784

7885
<MediaWebConfigXDTInstallFile Include="$(MSBuildProjectDirectory)\transforms\media-web.config.install.xdt" />
7986
<MediaWebConfigXDTUninstallFile Include="$(MSBuildProjectDirectory)\transforms\media-web.config.uninstall.xdt" />
8087

88+
<!-- Umbraco specific -->
89+
<!-- Newtonsoft.Json Excluded for now as Umbraco requires different major versions -->
90+
<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)\Microsoft.Data.Services.Client.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Microsoft.Azure.ConfigurationManager.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Microsoft.Azure.Storage.Blob.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Microsoft.Azure.Storage.Common.dll;$(CoreProjectDir)\bin\$(BuildConfig)\System.Spatial.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Microsoft.Azure.KeyVault.Core.dll" />
92+
<InstallerBinFiles Include="$(InstallerProjectDir)\bin\$(BuildConfig)\Our.Umbraco.FileSystemProviders.Azure.Installer.dll" />
93+
<UmbracoInstallerFiles Include="$(InstallerProjectDir)\Configurator\**\*.*"/>
94+
<UmbracoInstallerLogo Include="$(MSBuildProjectDirectory)\assets\logo\azure-logo-32.png"/>
95+
<PackageFile Include="$(MSBuildProjectDirectory)\package.xml" />
96+
<ImageProcessorSecurityConfigXDTInstallFile Include="$(MSBuildProjectDirectory)\transforms\security.config.install.xdt" />
97+
<ImageProcessorSecurityConfigDefaultFile Include="$(InstallerProjectDir)\config\imageprocessor\security.config" />
8198
<!-- NuGet specific -->
82-
<SrcFiles Include="$(ProjectDir)\**\*.cs" Exclude="$(ProjectDir)\obj\**"/>
99+
<SrcFiles Include="$(MediaProjectDir)\**\*.cs" Exclude="$(MediaProjectDir)\obj\**"/>
83100
<NuSpecFile Include="$(MSBuildProjectDirectory)\UmbracoFileSystemProviders.Azure.Media.nuspec" />
84101
</ItemGroup>
85102

103+
<!-- Umbraco -->
104+
<Copy SourceFiles="@(CoreBinFiles)" DestinationFolder="$(BuildUmbDir)\bin" />
105+
<Copy SourceFiles="@(BinFiles)" DestinationFolder="$(BuildUmbDir)\bin" />
106+
<Copy SourceFiles="@(InstallerBinFiles)" DestinationFolder="$(BuildUmbDir)\bin" />
107+
<Copy SourceFiles="@(UmbracoOtherBinFiles)" DestinationFolder="$(BuildUmbDir)\bin" />
108+
<Copy SourceFiles="@(WebConfigXDTFiles)" DestinationFolder="$(BuildUmbDir)\App_Plugins\UmbracoFileSystemProviders\Azure\Install" />
109+
<Copy SourceFiles="@(UmbPakWebConfigXDTFiles)" DestinationFolder="$(BuildUmbDir)\App_Plugins\UmbracoFileSystemProviders\Azure\Install" />
110+
<Copy SourceFiles="@(MediaWebConfigXDTInstallFile)" DestinationFolder="$(BuildUmbDir)\App_Plugins\UmbracoFileSystemProviders\Azure\Install" />
111+
<Copy SourceFiles="@(MediaWebConfigXDTUninstallFile)" DestinationFolder="$(BuildUmbDir)\App_Plugins\UmbracoFileSystemProviders\Azure\Install" />
112+
113+
<Copy SourceFiles="@(ImageProcessorSecurityConfigXDTInstallFile)" DestinationFolder="$(BuildUmbDir)\App_Plugins\UmbracoFileSystemProviders\Azure\Install" />
114+
<Copy SourceFiles="@(ImageProcessorSecurityConfigDefaultFile)" DestinationFolder="$(BuildUmbDir)\App_Plugins\UmbracoFileSystemProviders\Azure\Install" />
115+
116+
<Copy SourceFiles="@(UmbracoInstallerFiles)" DestinationFiles="@(UmbracoInstallerFiles->'$(BuildUmbDir)\App_Plugins\UmbracoFileSystemProviders\Azure\Install\Configurator\%(RecursiveDir)%(Filename)%(Extension)')" />
117+
<Copy SourceFiles="@(UmbracoInstallerLogo)" DestinationFolder="$(BuildUmbDir)\App_Plugins\UmbracoFileSystemProviders\Azure\Install" />
118+
<Copy SourceFiles="@(PackageFile)" DestinationFolder="$(BuildUmbDir)" />
119+
86120
<!--NuGet -->
87121
<Copy SourceFiles="@(BinFiles)" DestinationFolder="$(BuildNuGetDir)\lib\net472" />
88122
<Copy SourceFiles="@(PdbFiles)" DestinationFolder="$(BuildNuGetDir)\lib\net472" />
@@ -94,10 +128,31 @@
94128
<Copy SourceFiles="@(NuSpecFile)" DestinationFolder="$(BuildNuGetDir)" />
95129
</Target>
96130

131+
<!-- MANIFEST UMBRACO -->
132+
<Target Name="ManifestUmbraco" DependsOnTargets="PrepareFiles">
133+
<ItemGroup>
134+
<ManifestFiles Include="$(BuildUmbDir)\**\*" Exclude="$(BuildUmbDir)\package.xml" />
135+
</ItemGroup>
136+
<ManifestUpdate
137+
ManifestFile="$(BuildUmbDir)\package.xml"
138+
WorkingDirectory="$(BuildUmbDir)"
139+
MinimumRequiredUmbracoVersion="$(MinUmbracoVersion)"
140+
PackageName="$(PackageName)"
141+
PackageVersion="$(FileVersion)"
142+
AuthorName="$(AuthorName)"
143+
AuthorUrl="$(AuthorUrl)"
144+
IconUrl="$(IconUrl)"
145+
Readme="$(Readme)"
146+
PackageLicenseName="$(PackageLicenseName)"
147+
PackageLicenseUrl="$(PackageLicenseUrl)"
148+
PackageUrl="$(ProjectUrl)"
149+
Files="@(ManifestFiles)" />
150+
</Target>
151+
97152
<!-- MANIFEST FOR NUGET PACKAGE -->
98153
<Target Name="ManifestNuGet" DependsOnTargets="PrepareFiles">
99154
<ItemGroup>
100-
<ManifestFiles Include="$(BuildNuGetDir)\**\*" Exclude="$(BuildNuGetDir)\UmbracoFileSystemProviders.Azure.Media.nuspec" />
155+
<ManifestFiles Include="$(BuildNuGetDir)\**\*" Exclude="$(BuildNuGetDir)\package.nuspec" />
101156
</ItemGroup>
102157
<MSBuild.NuGet.Tasks.ManifestUpdate
103158
ManifestFile="$(BuildNuGetDir)\UmbracoFileSystemProviders.Azure.Media.nuspec"
@@ -121,7 +176,15 @@
121176
</Target>
122177

123178
<!-- PACKAGE -->
124-
<Target Name="Package" DependsOnTargets="ManifestNuGet">
179+
<Target Name="Package" DependsOnTargets="ManifestUmbraco; ManifestNuGet">
180+
<ItemGroup>
181+
<PackageFiles Include="$(BuildUmbDir)\**\*.*" />
182+
</ItemGroup>
183+
184+
<Package ManifestFile="$(BuildUmbDir)\package.xml"
185+
WorkingDirectory="$(BuildUmbDir)"
186+
OutputDirectory="$(ArtifactsDir)"
187+
Files="@(PackageFiles)" />
125188

126189
<MSBuild.NuGet.Tasks.Pack NuGetExePath="$(RootDir)\build\tools\NuGet.exe"
127190
ManifestFile="$(BuildNuGetDir)\UmbracoFileSystemProviders.Azure.Media.nuspec"

0 commit comments

Comments
 (0)