Skip to content

Commit c40343e

Browse files
jviaujviau
committed
[MSBUILD SDK] Add general msbuild props, use worker SDK (#3176)
* Mirror feature branches * Use release tag for eng repo * Add initial Azure.Functions.Sdk project (#3142) * Add initial Azure.Functions.Sdk project * dotnet isolated -> dotnet-isolated * Add some general props to msbuild-sdk * Use Worker sdk internally * Add Azure.Functions.Sdk to sln * Remove new sln configs * Update msbuild package * Update msbuild package * Update msbuild package * Update implicit package to latest
1 parent 48ac353 commit c40343e

File tree

6 files changed

+72
-1
lines changed

6 files changed

+72
-1
lines changed

‎DotNetWorker.sln‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DependentAssemblyWithFuncti
6666
EndProject
6767
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sdk.E2ETests", "test\Sdk.E2ETests\Sdk.E2ETests.csproj", "{750993F6-4E3B-411B-9471-74CEA4F9C23A}"
6868
EndProject
69+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure.Functions.Sdk", "src\Azure.Functions.Sdk\Azure.Functions.Sdk.csproj", "{02CBCC67-A10C-4064-AA5D-84533AC02342}"
70+
EndProject
6971
Global
7072
GlobalSection(SolutionConfigurationPlatforms) = preSolution
7173
Debug|Any CPU = Debug|Any CPU
@@ -148,6 +150,10 @@ Global
148150
{750993F6-4E3B-411B-9471-74CEA4F9C23A}.Debug|Any CPU.Build.0 = Debug|Any CPU
149151
{750993F6-4E3B-411B-9471-74CEA4F9C23A}.Release|Any CPU.ActiveCfg = Release|Any CPU
150152
{750993F6-4E3B-411B-9471-74CEA4F9C23A}.Release|Any CPU.Build.0 = Release|Any CPU
153+
{02CBCC67-A10C-4064-AA5D-84533AC02342}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
154+
{02CBCC67-A10C-4064-AA5D-84533AC02342}.Debug|Any CPU.Build.0 = Debug|Any CPU
155+
{02CBCC67-A10C-4064-AA5D-84533AC02342}.Release|Any CPU.ActiveCfg = Release|Any CPU
156+
{02CBCC67-A10C-4064-AA5D-84533AC02342}.Release|Any CPU.Build.0 = Release|Any CPU
151157
EndGlobalSection
152158
GlobalSection(SolutionProperties) = preSolution
153159
HideSolutionNode = FALSE
@@ -174,6 +180,7 @@ Global
174180
{BE88B7F0-F0DF-4EC4-8312-EDCB61810FA4} = {E785547C-7546-469F-827C-FDF999D5D7E8}
175181
{429D067C-0846-40EF-A264-AB0C5D551CB0} = {E785547C-7546-469F-827C-FDF999D5D7E8}
176182
{750993F6-4E3B-411B-9471-74CEA4F9C23A} = {E785547C-7546-469F-827C-FDF999D5D7E8}
183+
{02CBCC67-A10C-4064-AA5D-84533AC02342} = {083592CA-7DAB-44CE-8979-44FAFA46AEC3}
177184
EndGlobalSection
178185
GlobalSection(ExtensibilityGlobals) = postSolution
179186
SolutionGuid = {497D2ED4-A13E-4BCA-8D29-F30CA7D0EA4A}

‎src/Azure.Functions.Sdk/Azure.Functions.Sdk.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.11.4" ExcludeAssets="Runtime" />
15+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.11.48" ExcludeAssets="Runtime" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎src/Azure.Functions.Sdk/Sdk/Sdk.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,6 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
1515
<UsingAzureFunctionsSdk>true</UsingAzureFunctionsSdk>
1616
</PropertyGroup>
1717

18+
<Import Project="$(MSBuildThisFileDirectory)../targets/Azure.Functions.Sdk.props" />
19+
1820
</Project>

‎src/Azure.Functions.Sdk/Sdk/Sdk.targets‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,6 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
1616
<AzureFunctionsSdkTasksAssembly>$(AzureFunctionsSdkTasksDirectory)Azure.Functions.Sdk.dll</AzureFunctionsSdkTasksAssembly>
1717
</PropertyGroup>
1818

19+
<Import Project="$(MSBuildThisFileDirectory)../targets/Azure.Functions.Sdk.targets" />
20+
1921
</Project>

‎src/Azure.Functions.Sdk/Targets/Azure.Functions.Sdk.props‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<!--
2+
***********************************************************************************************
3+
Azure.Functions.Sdk.props
4+
5+
WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
6+
created a backup copy. Incorrect changes to this file will make it
7+
impossible to load or build your projects from the command-line or the IDE.
8+
9+
***********************************************************************************************
10+
-->
11+
12+
<Project>
13+
14+
<PropertyGroup>
15+
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
16+
<MSBuildFunctionsTargetsPath>$(MSBuildExtensionsPath)\Microsoft\VisualStudio\Managed.Functions\</MSBuildFunctionsTargetsPath>
17+
</PropertyGroup>
18+
19+
<Import Sdk="Microsoft.NET.Sdk.Worker" Project="Sdk.props" />
20+
21+
<!-- Enable Azure Functions project capability to enable tools -->
22+
<ItemGroup>
23+
<ProjectCapability Include="AzureFunctions" />
24+
</ItemGroup>
25+
26+
<ItemGroup>
27+
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="2.2.0" IsImplicitlyDefined="true" />
28+
</ItemGroup>
29+
30+
<ItemGroup>
31+
<Content Update="local.settings.json" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="Never" Condition="Exists('local.settings.json')" />
32+
</ItemGroup>
33+
34+
</Project>

‎src/Azure.Functions.Sdk/Targets/Azure.Functions.Sdk.targets‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<!--
2+
***********************************************************************************************
3+
Azure.Functions.Sdk.targets
4+
5+
WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
6+
created a backup copy. Incorrect changes to this file will make it
7+
impossible to load or build your projects from the command-line or the IDE.
8+
9+
***********************************************************************************************
10+
-->
11+
12+
<Project>
13+
14+
<Import Sdk="Microsoft.NET.Sdk.Worker" Project="Sdk.targets" />
15+
16+
<PropertyGroup>
17+
<_AzureFunctionsVersionStandardized>$(AzureFunctionsVersion.ToLowerInvariant().Split('-')[0])</_AzureFunctionsVersionStandardized>
18+
<_ToolingSuffix Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">net$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)', 1))-isolated</_ToolingSuffix>
19+
<_ToolingSuffix Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">netfx-isolated</_ToolingSuffix>
20+
<FunctionsToolingSuffix Condition="'$(FunctionsToolingSuffix)' == ''">$(_ToolingSuffix)</FunctionsToolingSuffix>
21+
</PropertyGroup>
22+
23+
<Import Project="$(MSBuildFunctionsTargetsPath)Microsoft.Azure.Functions.Designtime.targets"
24+
Condition="Exists('$(MSBuildFunctionsTargetsPath)Microsoft.Azure.Functions.Designtime.targets')" />
25+
26+
</Project>

0 commit comments

Comments
 (0)