Skip to content

Commit 2f6cf2f

Browse files
idseefeldidseefeld
committed
Merge remote-tracking branch 'upstream/master' into develop
2 parents cade168 + 1e545c7 commit 2f6cf2f

23 files changed

+302
-121
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
#VS 2015 hidden folder
55
src/.vs/*
66

7+
build/tools/vswhere.2.0.2
8+
build/tools/vswhere.exe
9+
710
artifacts/*
811

912
# User-specific files

‎appveyor.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,23 @@
1-
os: Visual Studio 2015
1+
os: Visual Studio 2017
22

33
# Version format
4-
version: 0.5.9.{build}
4+
version: 1.0.2.{build}
55

66
cache:
77
- src\packages -> **\packages.config # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified
88

99
# UMBRACO_PACKAGE_PRERELEASE_SUFFIX if a rtm release build this should be blank, otherwise if empty will default to alpha
1010
# example UMBRACO_PACKAGE_PRERELEASE_SUFFIX=beta
1111
init:
12-
- set UMBRACO_PACKAGE_PRERELEASE_SUFFIX=beta
12+
- set UMBRACO_PACKAGE_PRERELEASE_SUFFIX=
13+
14+
install:
15+
- ps: >-
16+
$msiPath = "$($env:USERPROFILE)\MicrosoftAzureStorageEmulator.msi"
17+
18+
(New-Object Net.WebClient).DownloadFile('https://download.microsoft.com/download/F/3/8/F3857A38-D344-43B4-8E5B-2D03489909B9/MicrosoftAzureStorageEmulator.msi', $msiPath)
19+
20+
cmd /c start /wait msiexec /i $msiPath /quiet
1321
1422
build_script:
1523
- build-appveyor.cmd

‎build-appveyor.cmd

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,35 @@ ECHO APPVEYOR_REPO_TAG: %APPVEYOR_REPO_TAG%
33
ECHO APPVEYOR_BUILD_NUMBER : %APPVEYOR_BUILD_NUMBER%
44
ECHO APPVEYOR_BUILD_VERSION : %APPVEYOR_BUILD_VERSION%
55

6-
CALL build\tools\NuGet.exe restore src\UmbracoFileSystemProviders.Azure.sln
7-
CALL "%programfiles(x86)%\MSBuild\14.0\Bin\MsBuild.exe" build\package.proj
6+
CALL NuGet.exe restore src\UmbracoFileSystemProviders.Azure.sln
7+
8+
cd build
9+
10+
SET toolsFolder=%CD%\tools\
11+
IF NOT EXIST "%toolsFolder%" (
12+
MD tools
13+
)
14+
15+
IF NOT EXIST "%toolsFolder%vswhere.exe" (
16+
ECHO vswhere not found - fetching now
17+
nuget install vswhere -Version 2.0.2 -Source nuget.org -OutputDirectory tools
18+
)
19+
20+
FOR /f "delims=" %%A in ('dir "%toolsFolder%vswhere.*" /b') DO SET "vswhereExePath=%toolsFolder%%%A\"
21+
MOVE "%vswhereExePath%tools\vswhere.exe" "%toolsFolder%vswhere.exe"
22+
23+
for /f "usebackq tokens=1* delims=: " %%i in (`"%CD%\tools\vswhere.exe" -latest -requires Microsoft.Component.MSBuild`) do (
24+
if /i "%%i"=="installationPath" set InstallDir=%%j
25+
)
26+
27+
SET VSWherePath="%InstallDir%\MSBuild"
28+
29+
ECHO.
30+
ECHO Visual Studio is installed in: %InstallDir%
31+
32+
CALL "%InstallDir%\MSBuild\15.0\Bin\amd64\MsBuild.exe" package.proj %~1
33+
34+
@IF %ERRORLEVEL% NEQ 0 GOTO err
35+
@EXIT /B 0
36+
:err
37+
@EXIT /B 1

‎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.nuspec

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
3-
<metadata>
4-
<id></id>
5-
<version>0.0.0</version>
6-
<title></title>
7-
<authors></authors>
8-
<owners></owners>
9-
<projectUrl></projectUrl>
10-
<iconUrl></iconUrl>
11-
<requireLicenseAcceptance></requireLicenseAcceptance>
12-
<description></description>
13-
<summary></summary>
14-
<copyright></copyright>
15-
<licenseUrl></licenseUrl>
16-
<language></language>
17-
<tags></tags>
18-
<dependencies>
19-
<dependency id="UmbracoCms.Core" version="0.0.0" />
20-
<dependency id="WindowsAzure.Storage" version="6.2.0" />
21-
<dependency id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.1" />
3+
<metadata>
4+
<id></id>
5+
<version>0.0.0</version>
6+
<title></title>
7+
<authors></authors>
8+
<owners></owners>
9+
<projectUrl></projectUrl>
10+
<iconUrl></iconUrl>
11+
<requireLicenseAcceptance></requireLicenseAcceptance>
12+
<description></description>
13+
<summary></summary>
14+
<copyright></copyright>
15+
<licenseUrl></licenseUrl>
16+
<language></language>
17+
<tags></tags>
18+
<dependencies>
19+
<dependency id="UmbracoCms.Core" version="0.0.0" />
20+
<dependency id="WindowsAzure.Storage" version="8.7.0" />
21+
<dependency id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.3" />
22+
<dependency id="Microsoft.Azure.KeyVault.Core" version="2.0.4" />
23+
<dependency id="Microsoft.Data.Services.Client" version="5.8.3" />
2224
</dependencies>
23-
</metadata>
25+
</metadata>
2426
</package>

‎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/tools/NuGet.exe

1.19 MB
Binary file not shown.

‎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.Installer/Configurator/Views/Configure.ascx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<%@ Control Language="c#" AutoEventWireup="True" TargetSchema="http://schemas.microsoft.com/intellisense/ie5"%>
22

3-
<script src="/umbraco/lib/angular/1.1.5/angular.min.js"></script>
4-
<script src="/App_Plugins/UmbracoFileSystemProviders/Azure/Install/Configurator/Controllers/Configure.js"></script>
3+
<script src="<%=ResolveUrl("~/umbraco/lib/angular/1.1.5/angular.min.js") %>"></script>
4+
<script src="<%=ResolveUrl("~/App_Plugins/UmbracoFileSystemProviders/Azure/Install/Configurator/Controllers/Configure.js")%>"></script>
55

66
<div ng-app ="UFSPLoader">
77
<div ng-controller="Loader">
88
<div class="row">
99
<div class="span1">
10-
<img src="/App_Plugins/UmbracoFileSystemProviders/Azure/Install/azure-logo-32.png"/>
10+
<img src="<%=ResolveUrl("~/App_Plugins/UmbracoFileSystemProviders/Azure/Install/azure-logo-32.png")%>"/>
1111
</div>
1212
<div><h4>Umbraco Azure File System Provider</h4></div>
1313
</div>
@@ -23,8 +23,8 @@
2323
<ng-form name="form">
2424
<label class="control-label" for="param.key">{{ capitalizeFirstLetter(param.key) }}</label>
2525
<div class="controls">
26-
<span ng-if="getInputType(param.key) === 'checkbox'" ng-include="'/App_Plugins/UmbracoFileSystemProviders/Azure/Install/Configurator/Views/checkbox.htm'"></span>
27-
<span ng-if="getInputType(param.key) === 'text'" ng-include="'/App_Plugins/UmbracoFileSystemProviders/Azure/Install/Configurator/Views/textfield.htm'"></span>
26+
<span ng-if="getInputType(param.key) === 'checkbox'" ng-include="'<%=ResolveUrl("/App_Plugins/UmbracoFileSystemProviders/Azure/Install/Configurator/Views/checkbox.htm")%>'"></span>
27+
<span ng-if="getInputType(param.key) === 'text'" ng-include="'<%=ResolveUrl("/App_Plugins/UmbracoFileSystemProviders/Azure/Install/Configurator/Views/textfield.htm")%>'"></span>
2828
</div>
2929
<span data-ng-show=" {{'form.'+param.key+'.$dirty && form.'+param.key+'.$error.required'}}">Required!</span>
3030
</ng-form>

0 commit comments

Comments
 (0)