Splitting WebJobs into separate service plan and updated deployment template
This commit is contained in:
Родитель
634637230e
Коммит
d45dd5f376
|
@ -11,6 +11,10 @@
|
||||||
"packageUri" : {
|
"packageUri" : {
|
||||||
"type" : "string",
|
"type" : "string",
|
||||||
"defaultValue" : "http://aka.ms/azureiot/remotemonitoring"
|
"defaultValue" : "http://aka.ms/azureiot/remotemonitoring"
|
||||||
|
},
|
||||||
|
"webJobPackageUri" : {
|
||||||
|
"type" : "string",
|
||||||
|
"defaultValue" : "http://aka.ms/azureiot/remotemonitoring/webjob"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"variables" : {
|
"variables" : {
|
||||||
|
@ -30,11 +34,16 @@
|
||||||
"webVersion" : "2015-04-01",
|
"webVersion" : "2015-04-01",
|
||||||
"bingMapsName" : "[concat(variables('name'), '-map')]",
|
"bingMapsName" : "[concat(variables('name'), '-map')]",
|
||||||
"bingMapsVersion" : "2015-07-02",
|
"bingMapsVersion" : "2015-07-02",
|
||||||
"webPlanName" : "[concat(variables('name'), '-plan')]",
|
"webJobPlanName": "[concat(variables('name'), '-jobs-plan')]",
|
||||||
"webSiteName" : "[variables('name')]",
|
"webJobSku" : "Basic",
|
||||||
|
"webJobWorkerSize" : "0",
|
||||||
|
"webJobWorkerCount": "2",
|
||||||
|
"webJobSiteName": "[concat(variables('name'), '-jobhost')]",
|
||||||
|
"webPlanName": "[concat(variables('name'), '-plan')]",
|
||||||
|
"webSiteName": "[variables('name')]",
|
||||||
"webSku" : "Basic",
|
"webSku" : "Basic",
|
||||||
"webWorkerSize" : "0",
|
"webWorkerSize" : "0",
|
||||||
"webWorkerCount" : "1",
|
"webWorkerCount" : "2",
|
||||||
"AADMetadataAddress" : "[concat('https://login.windows.net/' , parameters('AADTenant'), '/FederationMetadata/2007-06/FederationMetadata.xml')]",
|
"AADMetadataAddress" : "[concat('https://login.windows.net/' , parameters('AADTenant'), '/FederationMetadata/2007-06/FederationMetadata.xml')]",
|
||||||
"AADRealm" : "[toLower(concat('https://', variables('webSiteName'), '.azurewebsites.net/iotsuite'))]",
|
"AADRealm" : "[toLower(concat('https://', variables('webSiteName'), '.azurewebsites.net/iotsuite'))]",
|
||||||
"docDBVersion" : "2015-04-08",
|
"docDBVersion" : "2015-04-08",
|
||||||
|
@ -420,6 +429,17 @@
|
||||||
"workerSize" : "[variables('webWorkerSize')]",
|
"workerSize" : "[variables('webWorkerSize')]",
|
||||||
"numberOfWorkers" : "[variables('webWorkerCount')]"
|
"numberOfWorkers" : "[variables('webWorkerCount')]"
|
||||||
}
|
}
|
||||||
|
}, {
|
||||||
|
"apiVersion" : "[variables('webVersion')]",
|
||||||
|
"name" : "[variables('webJobPlanName')]",
|
||||||
|
"type" : "Microsoft.Web/serverfarms",
|
||||||
|
"location" : "[variables('location')]",
|
||||||
|
"properties" : {
|
||||||
|
"name" : "[variables('webJobPlanName')]",
|
||||||
|
"sku" : "[variables('webJobSku')]",
|
||||||
|
"workerSize" : "[variables('webJobWorkerSize')]",
|
||||||
|
"numberOfWorkers" : "[variables('webJobWorkerCount')]"
|
||||||
|
}
|
||||||
}, {
|
}, {
|
||||||
"apiVersion" : "[variables('webVersion')]",
|
"apiVersion" : "[variables('webVersion')]",
|
||||||
"name" : "[variables('webSiteName')]",
|
"name" : "[variables('webSiteName')]",
|
||||||
|
@ -509,6 +529,92 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
}, {
|
||||||
|
"apiVersion" : "[variables('webVersion')]",
|
||||||
|
"name" : "[variables('webJobSiteName')]",
|
||||||
|
"type" : "Microsoft.Web/sites",
|
||||||
|
"location" : "[variables('location')]",
|
||||||
|
"dependsOn" : [
|
||||||
|
"[resourceId('Microsoft.Web/serverfarms', variables('webJobPlanName'))]",
|
||||||
|
"[resourceId('Microsoft.Web/sites', variables('webSiteName'))]"
|
||||||
|
],
|
||||||
|
"properties" : {
|
||||||
|
"serverFarmId" : "[variables('webJobPlanName')]",
|
||||||
|
"siteConfig" : {
|
||||||
|
"AlwaysOn" : true,
|
||||||
|
"appSettings" : [{
|
||||||
|
"name" : "ida.AADTenant",
|
||||||
|
"value" : "[parameters('AADTenant')]"
|
||||||
|
}, {
|
||||||
|
"name" : "ida.AADAudience",
|
||||||
|
"value" : "[variables('AADRealm')]"
|
||||||
|
}, {
|
||||||
|
"name" : "ida.FederationMetadataAddress",
|
||||||
|
"value" : "[variables('AADMetadataAddress')]"
|
||||||
|
}, {
|
||||||
|
"name" : "ida.FederationRealm",
|
||||||
|
"value" : "[variables('AADRealm')]"
|
||||||
|
}, {
|
||||||
|
"name" : "docdb.EndpointUrl",
|
||||||
|
"value" : "[reference(variables('docDBName')).documentEndpoint]"
|
||||||
|
}, {
|
||||||
|
"name" : "docdb.PrimaryAuthorizationKey",
|
||||||
|
"value" : "[listkeys(variables('docDBName'), '2015-04-08').primaryMasterKey]"
|
||||||
|
}, {
|
||||||
|
"name" : "iotHub.HostName",
|
||||||
|
"value" : "[reference(variables('iotHubResourceId')).hostName]"
|
||||||
|
}, {
|
||||||
|
"name" : "iotHub.ConnectionString",
|
||||||
|
"value" : "[concat('HostName=', reference(variables('iotHubResourceId')).hostName, ';SharedAccessKeyName=', variables('iotHubKeyName'), ';SharedAccessKey=', listkeys(variables('iotHubKeyResource'), variables('iotHubVersion')).primaryKey)]"
|
||||||
|
}, {
|
||||||
|
"name" : "device.StorageConnectionString",
|
||||||
|
"value" : "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('storageName'), ';AccountKey=', listkeys(variables('storageId'), variables('storageVersion')).key1)]"
|
||||||
|
}, {
|
||||||
|
"name" : "device.TableName",
|
||||||
|
"value" : "DeviceList"
|
||||||
|
}, {
|
||||||
|
"name" : "eventHub.HubName",
|
||||||
|
"value" : "[variables('ehOutName')]"
|
||||||
|
}, {
|
||||||
|
"name" : "eventHub.ConnectionString",
|
||||||
|
"value" : "[listkeys(variables('sbResourceId'), variables('sbVersion')).primaryConnectionString]"
|
||||||
|
}, {
|
||||||
|
"name" : "eventHub.StorageConnectionString",
|
||||||
|
"value" : "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('storageName'), ';AccountKey=', listkeys(variables('storageId'), variables('storageVersion')).key1)]"
|
||||||
|
}, {
|
||||||
|
"name" : "RulesEventHub.Name",
|
||||||
|
"value" : "[variables('ehRuleOutName')]"
|
||||||
|
}, {
|
||||||
|
"name" : "RulesEventHub.ConnectionString",
|
||||||
|
"value" : "[listkeys(variables('sbResourceId'), variables('sbVersion')).primaryConnectionString]"
|
||||||
|
}, {
|
||||||
|
"name" : "ObjectTypePrefix",
|
||||||
|
"value" : ""
|
||||||
|
}, {
|
||||||
|
"name" : "MapApiQueryKey",
|
||||||
|
"value" : "[listSecrets(variables('bingMapsName'), variables('bingMapsVersion')).QueryKey]"
|
||||||
|
}, {
|
||||||
|
"name" : "SolutionName",
|
||||||
|
"value" : "[variables('name')]"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
},
|
||||||
|
"resources" : [{
|
||||||
|
"apiVersion" : "[variables('webVersion')]",
|
||||||
|
"name" : "MSDeploy",
|
||||||
|
"type" : "extensions",
|
||||||
|
"dependsOn" : [
|
||||||
|
"[resourceId('Microsoft.Web/Sites', variables('webJobSiteName'))]"
|
||||||
|
],
|
||||||
|
"properties" : {
|
||||||
|
"packageUri" : "[parameters('webJobPackageUri')]",
|
||||||
|
"connectionString" : "",
|
||||||
|
"dbType" : ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"outputs" : {
|
"outputs" : {
|
||||||
|
|
|
@ -415,7 +415,6 @@
|
||||||
<Content Include="Content\screen.css.map">
|
<Content Include="Content\screen.css.map">
|
||||||
<DependentUpon>screen.css</DependentUpon>
|
<DependentUpon>screen.css</DependentUpon>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="Properties\webjobs-list.json" />
|
|
||||||
<None Include="Scripts\jquery-1.11.2.intellisense.js" />
|
<None Include="Scripts\jquery-1.11.2.intellisense.js" />
|
||||||
<Content Include="Scripts\IoTHelperScripts.js" />
|
<Content Include="Scripts\IoTHelperScripts.js" />
|
||||||
<Content Include="Scripts\jquery-1.11.2.js" />
|
<Content Include="Scripts\jquery-1.11.2.js" />
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
# Visual Studio 2013
|
# Visual Studio 2013
|
||||||
VisualStudioVersion = 12.0.31101.0
|
VisualStudioVersion = 12.0.40629.0
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "Common\Common.csproj", "{5959C109-5369-4FF7-8B55-605A79FDF200}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "Common\Common.csproj", "{5959C109-5369-4FF7-8B55-605A79FDF200}"
|
||||||
EndProject
|
EndProject
|
||||||
|
@ -24,6 +24,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Infrastructure.UnitTests",
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebJob", "DeviceAdministration\WebJob\WebJob.csproj", "{8F9CAF4E-8537-4398-A1C2-C39CC4136B69}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebJob", "DeviceAdministration\WebJob\WebJob.csproj", "{8F9CAF4E-8537-4398-A1C2-C39CC4136B69}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebJobHost", "WebJobHost\WebJobHost.csproj", "{350C5961-0778-45F8-9A59-D309FCD653DD}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
|
@ -58,6 +60,10 @@ Global
|
||||||
{8F9CAF4E-8537-4398-A1C2-C39CC4136B69}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{8F9CAF4E-8537-4398-A1C2-C39CC4136B69}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{8F9CAF4E-8537-4398-A1C2-C39CC4136B69}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{8F9CAF4E-8537-4398-A1C2-C39CC4136B69}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{8F9CAF4E-8537-4398-A1C2-C39CC4136B69}.Release|Any CPU.Build.0 = Release|Any CPU
|
{8F9CAF4E-8537-4398-A1C2-C39CC4136B69}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{350C5961-0778-45F8-9A59-D309FCD653DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{350C5961-0778-45F8-9A59-D309FCD653DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{350C5961-0778-45F8-9A59-D309FCD653DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{350C5961-0778-45F8-9A59-D309FCD653DD}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|
|
@ -0,0 +1,35 @@
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
// General Information about an assembly is controlled through the following
|
||||||
|
// set of attributes. Change these attribute values to modify the information
|
||||||
|
// associated with an assembly.
|
||||||
|
[assembly: AssemblyTitle("WebJobHost")]
|
||||||
|
[assembly: AssemblyDescription("")]
|
||||||
|
[assembly: AssemblyConfiguration("")]
|
||||||
|
[assembly: AssemblyCompany("Microsoft")]
|
||||||
|
[assembly: AssemblyProduct("Azure Remote Monitoring Solution")]
|
||||||
|
[assembly: AssemblyCopyright("Copyright © 2015")]
|
||||||
|
[assembly: AssemblyTrademark("")]
|
||||||
|
[assembly: AssemblyCulture("")]
|
||||||
|
|
||||||
|
// Setting ComVisible to false makes the types in this assembly not visible
|
||||||
|
// to COM components. If you need to access a type in this assembly from
|
||||||
|
// COM, set the ComVisible attribute to true on that type.
|
||||||
|
[assembly: ComVisible(false)]
|
||||||
|
|
||||||
|
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||||
|
[assembly: Guid("7a06b2bb-cab3-4a1a-a9cc-c4696a61091e")]
|
||||||
|
|
||||||
|
// Version information for an assembly consists of the following four values:
|
||||||
|
//
|
||||||
|
// Major Version
|
||||||
|
// Minor Version
|
||||||
|
// Build Number
|
||||||
|
// Revision
|
||||||
|
//
|
||||||
|
// You can specify all the values or you can default the Revision and Build Numbers
|
||||||
|
// by using the '*' as shown below:
|
||||||
|
[assembly: AssemblyVersion("1.0.0.0")]
|
||||||
|
[assembly: AssemblyFileVersion("1.0.0.0")]
|
|
@ -2,7 +2,7 @@
|
||||||
"$schema": "http://schemastore.org/schemas/json/webjobs-list.json",
|
"$schema": "http://schemastore.org/schemas/json/webjobs-list.json",
|
||||||
"WebJobs": [
|
"WebJobs": [
|
||||||
{
|
{
|
||||||
"filePath": "../WebJob/WebJob.csproj"
|
"filePath": "../DeviceAdministration/WebJob/WebJob.csproj"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
|
@ -0,0 +1,30 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
|
||||||
|
<!-- For more information on using web.config transformation visit http://go.microsoft.com/fwlink/?LinkId=125889 -->
|
||||||
|
|
||||||
|
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
|
||||||
|
<!--
|
||||||
|
In the example below, the "SetAttributes" transform will change the value of
|
||||||
|
"connectionString" to use "ReleaseSQLServer" only when the "Match" locator
|
||||||
|
finds an attribute "name" that has a value of "MyDB".
|
||||||
|
|
||||||
|
<connectionStrings>
|
||||||
|
<add name="MyDB"
|
||||||
|
connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True"
|
||||||
|
xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
|
||||||
|
</connectionStrings>
|
||||||
|
-->
|
||||||
|
<system.web>
|
||||||
|
<!--
|
||||||
|
In the example below, the "Replace" transform will replace the entire
|
||||||
|
<customErrors> section of your web.config file.
|
||||||
|
Note that because there is only one customErrors section under the
|
||||||
|
<system.web> node, there is no need to use the "xdt:Locator" attribute.
|
||||||
|
|
||||||
|
<customErrors defaultRedirect="GenericError.htm"
|
||||||
|
mode="RemoteOnly" xdt:Transform="Replace">
|
||||||
|
<error statusCode="500" redirect="InternalError.htm"/>
|
||||||
|
</customErrors>
|
||||||
|
-->
|
||||||
|
</system.web>
|
||||||
|
</configuration>
|
|
@ -0,0 +1,31 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
|
||||||
|
<!-- For more information on using web.config transformation visit http://go.microsoft.com/fwlink/?LinkId=125889 -->
|
||||||
|
|
||||||
|
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
|
||||||
|
<!--
|
||||||
|
In the example below, the "SetAttributes" transform will change the value of
|
||||||
|
"connectionString" to use "ReleaseSQLServer" only when the "Match" locator
|
||||||
|
finds an attribute "name" that has a value of "MyDB".
|
||||||
|
|
||||||
|
<connectionStrings>
|
||||||
|
<add name="MyDB"
|
||||||
|
connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True"
|
||||||
|
xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
|
||||||
|
</connectionStrings>
|
||||||
|
-->
|
||||||
|
<system.web>
|
||||||
|
<compilation xdt:Transform="RemoveAttributes(debug)" />
|
||||||
|
<!--
|
||||||
|
In the example below, the "Replace" transform will replace the entire
|
||||||
|
<customErrors> section of your web.config file.
|
||||||
|
Note that because there is only one customErrors section under the
|
||||||
|
<system.web> node, there is no need to use the "xdt:Locator" attribute.
|
||||||
|
|
||||||
|
<customErrors defaultRedirect="GenericError.htm"
|
||||||
|
mode="RemoteOnly" xdt:Transform="Replace">
|
||||||
|
<error statusCode="500" redirect="InternalError.htm"/>
|
||||||
|
</customErrors>
|
||||||
|
-->
|
||||||
|
</system.web>
|
||||||
|
</configuration>
|
|
@ -0,0 +1,77 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!--
|
||||||
|
For more information on how to configure your ASP.NET application, please visit
|
||||||
|
http://go.microsoft.com/fwlink/?LinkId=169433
|
||||||
|
-->
|
||||||
|
<configuration>
|
||||||
|
<system.web>
|
||||||
|
<compilation debug="true" targetFramework="4.5" />
|
||||||
|
<httpRuntime targetFramework="4.5" />
|
||||||
|
</system.web>
|
||||||
|
<appSettings>
|
||||||
|
<add key="ida.AADTenant" value="config:AADTenant" />
|
||||||
|
<add key="ida.AADAudience" value="config:AADAudience" />
|
||||||
|
<add key="ida.FederationMetadataAddress" value="config:AADMetadataAddress" />
|
||||||
|
<add key="ida.FederationRealm" value="config:AADRealm" />
|
||||||
|
<add key="docdb.EndpointUrl" value="config:DocDbEndPoint" />
|
||||||
|
<add key="docdb.PrimaryAuthorizationKey" value="config:DocDBKey" />
|
||||||
|
<add key="docdb.DatabaseId" value="DevMgmtDB" />
|
||||||
|
<add key="docdb.DocumentCollectionId" value="DevMgmtCollection" />
|
||||||
|
<add key="iotHub.HostName" value="config:IotHubName" />
|
||||||
|
<add key="iotHub.ConnectionString" value="config:IotHubConnectionString" />
|
||||||
|
<add key="device.StorageConnectionString" value="config:ServiceStoreAccountConnectionString" />
|
||||||
|
<add key="device.TableName" value="config:DeviceTableName" />
|
||||||
|
<add key="DeviceRulesStoreContainerName" value="devicerules" />
|
||||||
|
<add key="DeviceRulesTableName" value="DeviceRulesNormalizedTable" />
|
||||||
|
<add key="ActionMappingStoreContainerName" value="actionmappings" />
|
||||||
|
<add key="ActionMappingStoreBlobName" value="mappings.json" />
|
||||||
|
<add key="AsaRefDataRulesBlobName" value="devicerules.json" />
|
||||||
|
<add key="SolutionName" value="Remote Monitoring Solution" />
|
||||||
|
<add key="TelemetryStoreContainerName" value="devicetelemetry" />
|
||||||
|
<add key="TelemetryDataPrefix" value="devicetelemetry/" />
|
||||||
|
<add key="TelemetrySummaryPrefix" value="devicetelemetry-summary/" />
|
||||||
|
<add key="AlertsStoreContainerName" value="rulesoutput" />
|
||||||
|
<add key="DeviceAlertsDataPrefix" value="" />
|
||||||
|
<add key="MapApiQueryKey" value="config:MapApiQueryKey" />
|
||||||
|
</appSettings>
|
||||||
|
|
||||||
|
<system.web>
|
||||||
|
<compilation debug="true" targetFramework="4.5.1" />
|
||||||
|
<httpRuntime targetFramework="4.5" />
|
||||||
|
<globalization culture="auto" uiCulture="auto" enableClientBasedCulture="true" />
|
||||||
|
<customErrors mode="RemoteOnly" />
|
||||||
|
<sessionState mode="Off" />
|
||||||
|
</system.web>
|
||||||
|
<runtime>
|
||||||
|
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||||
|
<dependentAssembly>
|
||||||
|
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
|
||||||
|
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
|
||||||
|
</dependentAssembly>
|
||||||
|
<dependentAssembly>
|
||||||
|
<assemblyIdentity name="Microsoft.WindowsAzure.ServiceRuntime" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||||
|
<bindingRedirect oldVersion="0.0.0.0-2.7.0.0" newVersion="2.7.0.0" />
|
||||||
|
</dependentAssembly>
|
||||||
|
<dependentAssembly>
|
||||||
|
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||||
|
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
|
||||||
|
</dependentAssembly>
|
||||||
|
<dependentAssembly>
|
||||||
|
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||||
|
<bindingRedirect oldVersion="0.0.0.0-5.0.2.0" newVersion="5.0.2.0" />
|
||||||
|
</dependentAssembly>
|
||||||
|
<dependentAssembly>
|
||||||
|
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||||
|
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
|
||||||
|
</dependentAssembly>
|
||||||
|
<dependentAssembly>
|
||||||
|
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||||
|
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
|
||||||
|
</dependentAssembly>
|
||||||
|
<dependentAssembly>
|
||||||
|
<assemblyIdentity name="System.Web.Http.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||||
|
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
|
||||||
|
</dependentAssembly>
|
||||||
|
</assemblyBinding>
|
||||||
|
</runtime>
|
||||||
|
</configuration>
|
|
@ -0,0 +1,126 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||||
|
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||||
|
<ProductVersion>
|
||||||
|
</ProductVersion>
|
||||||
|
<SchemaVersion>2.0</SchemaVersion>
|
||||||
|
<ProjectGuid>{350C5961-0778-45F8-9A59-D309FCD653DD}</ProjectGuid>
|
||||||
|
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
|
||||||
|
<OutputType>Library</OutputType>
|
||||||
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
|
<RootNamespace>WebJobHost</RootNamespace>
|
||||||
|
<AssemblyName>WebJobHost</AssemblyName>
|
||||||
|
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||||
|
<UseIISExpress>true</UseIISExpress>
|
||||||
|
<IISExpressSSLPort />
|
||||||
|
<IISExpressAnonymousAuthentication />
|
||||||
|
<IISExpressWindowsAuthentication />
|
||||||
|
<IISExpressUseClassicPipelineMode />
|
||||||
|
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
|
||||||
|
<RestorePackages>true</RestorePackages>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||||
|
<DebugSymbols>true</DebugSymbols>
|
||||||
|
<DebugType>full</DebugType>
|
||||||
|
<Optimize>false</Optimize>
|
||||||
|
<OutputPath>bin\</OutputPath>
|
||||||
|
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||||
|
<ErrorReport>prompt</ErrorReport>
|
||||||
|
<WarningLevel>4</WarningLevel>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
|
<DebugType>pdbonly</DebugType>
|
||||||
|
<Optimize>true</Optimize>
|
||||||
|
<OutputPath>bin\</OutputPath>
|
||||||
|
<DefineConstants>TRACE</DefineConstants>
|
||||||
|
<ErrorReport>prompt</ErrorReport>
|
||||||
|
<WarningLevel>4</WarningLevel>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Reference Include="Microsoft.CSharp" />
|
||||||
|
<Reference Include="System.Web.DynamicData" />
|
||||||
|
<Reference Include="System.Web.Entity" />
|
||||||
|
<Reference Include="System.Web.ApplicationServices" />
|
||||||
|
<Reference Include="System.ComponentModel.DataAnnotations" />
|
||||||
|
<Reference Include="System" />
|
||||||
|
<Reference Include="System.Data" />
|
||||||
|
<Reference Include="System.Core" />
|
||||||
|
<Reference Include="System.Data.DataSetExtensions" />
|
||||||
|
<Reference Include="System.Web.Extensions" />
|
||||||
|
<Reference Include="System.Xml.Linq" />
|
||||||
|
<Reference Include="System.Drawing" />
|
||||||
|
<Reference Include="System.Web" />
|
||||||
|
<Reference Include="System.Xml" />
|
||||||
|
<Reference Include="System.Configuration" />
|
||||||
|
<Reference Include="System.Web.Services" />
|
||||||
|
<Reference Include="System.EnterpriseServices" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Content Include="Properties\webjobs-list.json" />
|
||||||
|
<Content Include="packages.config" />
|
||||||
|
<None Include="Web.Debug.config">
|
||||||
|
<DependentUpon>Web.config</DependentUpon>
|
||||||
|
</None>
|
||||||
|
<None Include="Web.Release.config">
|
||||||
|
<DependentUpon>Web.config</DependentUpon>
|
||||||
|
</None>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Content Include="Web.config" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\DeviceAdministration\WebJob\WebJob.csproj">
|
||||||
|
<Project>{8f9caf4e-8537-4398-a1c2-c39cc4136b69}</Project>
|
||||||
|
<Name>WebJob</Name>
|
||||||
|
</ProjectReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup>
|
||||||
|
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
|
||||||
|
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||||
|
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
|
||||||
|
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
|
||||||
|
<Target Name="MvcBuildViews" AfterTargets="AfterBuild" Condition="'$(MvcBuildViews)'=='true'">
|
||||||
|
<AspNetCompiler VirtualPath="temp" PhysicalPath="$(WebProjectOutputDir)" />
|
||||||
|
</Target>
|
||||||
|
<ProjectExtensions>
|
||||||
|
<VisualStudio>
|
||||||
|
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
|
||||||
|
<WebProjectProperties>
|
||||||
|
<UseIIS>True</UseIIS>
|
||||||
|
<AutoAssignPort>True</AutoAssignPort>
|
||||||
|
<DevelopmentServerPort>37386</DevelopmentServerPort>
|
||||||
|
<DevelopmentServerVPath>/</DevelopmentServerVPath>
|
||||||
|
<IISUrl>http://localhost:37386/</IISUrl>
|
||||||
|
<NTLMAuthentication>False</NTLMAuthentication>
|
||||||
|
<UseCustomServer>False</UseCustomServer>
|
||||||
|
<CustomServerUrl>
|
||||||
|
</CustomServerUrl>
|
||||||
|
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
|
||||||
|
</WebProjectProperties>
|
||||||
|
</FlavorProperties>
|
||||||
|
</VisualStudio>
|
||||||
|
</ProjectExtensions>
|
||||||
|
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
|
||||||
|
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||||
|
<PropertyGroup>
|
||||||
|
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable 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('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
|
||||||
|
</Target>
|
||||||
|
<Import Project="..\packages\Microsoft.Web.WebJobs.Publish.1.0.3\tools\webjobs.targets" Condition="Exists('..\packages\Microsoft.Web.WebJobs.Publish.1.0.3\tools\webjobs.targets')" />
|
||||||
|
<!-- 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.
|
||||||
|
<Target Name="BeforeBuild">
|
||||||
|
</Target>
|
||||||
|
<Target Name="AfterBuild">
|
||||||
|
</Target>
|
||||||
|
-->
|
||||||
|
</Project>
|
|
@ -0,0 +1,4 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<packages>
|
||||||
|
<package id="Microsoft.Web.WebJobs.Publish" version="1.0.3" targetFramework="net45" />
|
||||||
|
</packages>
|
|
@ -66,6 +66,7 @@
|
||||||
rmdir /s /q Build_Output)
|
rmdir /s /q Build_Output)
|
||||||
msbuild RemoteMonitoring.sln /v:m /p:Configuration=%Configuration%
|
msbuild RemoteMonitoring.sln /v:m /p:Configuration=%Configuration%
|
||||||
msbuild DeviceAdministration\Web\Web.csproj /v:m /T:Package /P:VisualStudioVersion=12.0 /p:OutputPath=%~dp0Build_Output\
|
msbuild DeviceAdministration\Web\Web.csproj /v:m /T:Package /P:VisualStudioVersion=12.0 /p:OutputPath=%~dp0Build_Output\
|
||||||
|
msbuild WebJobHost\WebJobHost.csproj /v:m /T:Package /P:VisualStudioVersion=12.0 /p:OutputPath=%~dp0Build_Output\
|
||||||
@IF /I '%ERRORLEVEL%' NEQ '0' (
|
@IF /I '%ERRORLEVEL%' NEQ '0' (
|
||||||
@echo Error msbuild IoTRefImplementation.sln /v:m /t:publish /p:Configuration=%Configuration%
|
@echo Error msbuild IoTRefImplementation.sln /v:m /t:publish /p:Configuration=%Configuration%
|
||||||
@goto :Error
|
@goto :Error
|
||||||
|
|
Загрузка…
Ссылка в новой задаче