Skip to content

Commit 794ec6b

Browse files
liliankasemfabiocav
authored andcommitted
Remove TFM from common.props and update .csproj files (#10109)
1 parent ed02f52 commit 794ec6b

File tree

9 files changed

+236
-223
lines changed

9 files changed

+236
-223
lines changed

.vscode/launch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"request": "launch",
1111
"preLaunchTask": "build",
1212
// If you have changed target frameworks, make sure to update the program path.
13-
"program": "${workspaceFolder}/out/bin/WebJobs.Script.WebHost/debug_net8/Microsoft.Azure.WebJobs.Script.WebHost.dll",
13+
"program": "${workspaceFolder}/out/bin/WebJobs.Script.WebHost/debug_net8.0/Microsoft.Azure.WebJobs.Script.WebHost.dll",
1414
"args": [],
1515
"cwd": "${workspaceFolder}/sample/Node",
1616
"stopAtEntry": false,

build/Get-AzureFunctionsVersion.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ function Get-AzureFunctionsVersion {
1313
}
1414

1515
# use the same logic as the projects to generate the site extension version
16-
$cmd = "build", "$PSScriptRoot\common.props", "/t:EchoVersion", "-restore:False", "/p:BuildNumber=$buildNumber", "/p:MinorVersionPrefix=$minorVersionPrefix", $suffixCmd, "--nologo", "-clp:NoSummary"
16+
$cmd = "build", "$PSScriptRoot\version.proj", "/t:EchoVersion", "-restore:False", "/p:BuildNumber=$buildNumber", "/p:MinorVersionPrefix=$minorVersionPrefix", $suffixCmd, "--nologo", "-clp:NoSummary"
1717
$version = (& dotnet $cmd).Trim()
1818

1919
return $version

build/common.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project>
22
<Import Project=".\package.props" />
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.1</TargetFrameworks>
54
<LangVersion>latest</LangVersion>
65
<MajorVersion>4</MajorVersion>
76
<MinorVersion>$(MinorVersionPrefix)34</MinorVersion>

build/version.proj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<Project>
2+
<Import Project=".\common.props" />
3+
<PropertyGroup>
4+
<TargetFramework>netstandard2.1</TargetFramework>
5+
</PropertyGroup>
6+
</Project>

src/WebJobs.Script/WebJobs.Script.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\build\common.props" />
33
<PropertyGroup>
4+
<TargetFramework>netstandard2.1</TargetFramework>
45
<PackageId>Microsoft.Azure.WebJobs.Script</PackageId>
56
<AssemblyName>Microsoft.Azure.WebJobs.Script</AssemblyName>
67
<RootNamespace>Microsoft.Azure.WebJobs.Script</RootNamespace>

test/CSharpPrecompiledTestProjects/Dependency56/Dependency56.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

test/CSharpPrecompiledTestProjects/DependencyA/Dependency55.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="..\..\build\common.props" />
33
<Import Project="..\..\build\python.props" />
44
<PropertyGroup>
5-
<TargetFrameworks>net8.0</TargetFrameworks>
5+
<TargetFramework>net8.0</TargetFramework>
66
<IsPackable>false</IsPackable>
77
<AssemblyName>Microsoft.Azure.WebJobs.Script.Tests.Integration</AssemblyName>
88
<RootNamespace>Microsoft.Azure.WebJobs.Script.Tests.Integration</RootNamespace>

0 commit comments

Comments
 (0)