Azure · mattchenderson · Dec 6, 2024 · Jan 27, 2025 · Jan 27, 2025 · Jan 27, 2025
diff --git a/extensions/Worker.Extensions.Http.AspNetCore/release_notes.md b/extensions/Worker.Extensions.Http.AspNetCore/release_notes.md
@@ -7,6 +7,7 @@
 ### Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore <version>
 
 - Update `ContextReference` to no longer use a given invocation's cancellation token (#2894)
+- Global usings added to match `Microsoft.NET.Sdk.Web` (#2934)
 
 ### Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore.Analyzers  <version>
 

diff --git a/....AspNetCore/src/Targets/Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore.props b/....AspNetCore/src/Targets/Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore.props
@@ -0,0 +1,27 @@
+<!--
+***********************************************************************************************
+Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore.props
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+***********************************************************************************************
+-->
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+
+  <ItemGroup Condition="'$(Language)' == 'C#' AND ('$(ImplicitUsings)' == 'true' or '$(ImplicitUsings)' == 'enable')">
+    <!-- Based on https://github.com/dotnet/sdk/blob/main/src/WebSdk/Web/Targets/Sdk.Server.props -->
+    <Using Include="System.Net.Http.Json" />
+    <Using Include="Microsoft.AspNetCore.Builder" />
+    <Using Include="Microsoft.AspNetCore.Hosting" />
+    <Using Include="Microsoft.AspNetCore.Http" />
+    <Using Include="Microsoft.AspNetCore.Routing" />
+    <Using Include="Microsoft.Extensions.Configuration" />
+    <Using Include="Microsoft.Extensions.DependencyInjection" />
+    <Using Include="Microsoft.Extensions.Hosting" />
+    <Using Include="Microsoft.Extensions.Logging" />
+  </ItemGroup>
+
+</Project>
diff --git a/extensions/Worker.Extensions.Http.AspNetCore/src/Worker.Extensions.Http.AspNetCore.csproj b/extensions/Worker.Extensions.Http.AspNetCore/src/Worker.Extensions.Http.AspNetCore.csproj
@@ -26,4 +26,11 @@
     <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="2.0.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="Targets\**">
+        <Pack>true</Pack>
+        <PackagePath>build</PackagePath>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/release_notes.md b/release_notes.md
@@ -7,6 +7,7 @@
 ### Microsoft.Azure.Functions.Worker (metapackage) <version>
 
 - `AZURE_FUNCTIONS_` environment variables are now loaded correctly when using `FunctionsApplicationBuilder`. (#2878)
+- Global usings added for `Microsoft.Azure.Functions.Worker` and `Microsoft.Azure.Functions.Worker.Builder` (#2934)
 
 ### Microsoft.Azure.Functions.Worker.Core <version>
 

diff --git a/sdk/Sdk/Targets/Microsoft.Azure.Functions.Worker.Sdk.props b/sdk/Sdk/Targets/Microsoft.Azure.Functions.Worker.Sdk.props
@@ -36,6 +36,15 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
     <CompilerVisibleProperty Include="TargetFrameworkIdentifier" />
     <CompilerVisibleProperty Include="FunctionsExecutionModel" />
   </ItemGroup>
+
+  <ItemGroup Condition="'$(Language)' == 'C#' AND ('$(ImplicitUsings)' == 'true' or '$(ImplicitUsings)' == 'enable')">
+    <!-- Based on https://github.com/dotnet/sdk/blob/main/src/WebSdk/Worker/Targets/Microsoft.NET.Sdk.Worker.props -->  
+    <Using Include="Microsoft.Extensions.Configuration" />
+    <Using Include="Microsoft.Extensions.DependencyInjection" />
+    <Using Include="Microsoft.Extensions.Hosting" />
+    <Using Include="Microsoft.Extensions.Logging" />
+  </ItemGroup>
+
 <!--
   ***********************************************************************************************
   Import the Publish Props

diff --git a/sdk/release_notes.md b/sdk/release_notes.md
@@ -6,7 +6,7 @@
 
 ### Microsoft.Azure.Functions.Worker.Sdk <version>
 
-- <entry>
+- Global usings added to match `Microsoft.NET.Sdk.Worker` (#2934)
 
 ### Microsoft.Azure.Functions.Worker.Sdk.Generators 1.3.5
 

diff --git a/src/DotNetWorker/DotNetWorker.csproj b/src/DotNetWorker/DotNetWorker.csproj
@@ -20,4 +20,11 @@
     <ProjectReference Include="..\DotNetWorker.Grpc\DotNetWorker.Grpc.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="Targets\**">
+      <Pack>true</Pack>
+      <PackagePath>build</PackagePath>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/src/DotNetWorker/Targets/Microsoft.Azure.Functions.Worker.props b/src/DotNetWorker/Targets/Microsoft.Azure.Functions.Worker.props
@@ -0,0 +1,25 @@
+<!--
+***********************************************************************************************
+Microsoft.Azure.Functions.Worker.props
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+***********************************************************************************************
+-->
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <ItemGroup Condition="'$(Language)' == 'C#' AND ('$(ImplicitUsings)' == 'true' or '$(ImplicitUsings)' == 'enable')">
+    <Using Include="Microsoft.Azure.Functions.Worker" />
+    <Using Include="Microsoft.Azure.Functions.Worker.Builder" />
+  </ItemGroup>
+
+<!--
+  ***********************************************************************************************
+  Import the Publish Props
+  ***********************************************************************************************
+ -->
+  <Import Project="$(MSBuildThisFileDirectory)Microsoft.Azure.Functions.Worker.Publish.props" Condition="Exists('$(MSBuildThisFileDirectory)Microsoft.Azure.Functions.Worker.Publish.props')" />
+
+</Project>
diff --git a/test/Resources/Projects/FunctionApp01/FunctionApp01.csproj b/test/Resources/Projects/FunctionApp01/FunctionApp01.csproj
@@ -6,11 +6,11 @@
     <AzureFunctionsVersion>v4</AzureFunctionsVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <SdkVersion>1.17.2</SdkVersion>
+    <SdkVersion>2.0.0</SdkVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.22.0" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="2.0.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.2.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="$(SdkVersion)" />
   </ItemGroup>

diff --git a/test/SdkE2ETests/TestUtility.cs b/test/SdkE2ETests/TestUtility.cs
@@ -95,7 +95,7 @@ public static async Task RestoreAndBuildProjectAsync(string fullPathToProjFile,
 
             // Build
             outputHelper.WriteLine($"[{DateTime.UtcNow:O}] Building...");
-            dotnetArgs = $"build {projectNameToTest} --configuration {Configuration} -o {outputDir} -p:SdkVersion={SdkVersion} {additionalParams}";
+            dotnetArgs = $"build {projectNameToTest} --no-restore --configuration {Configuration} -o {outputDir} -p:SdkVersion={SdkVersion} {additionalParams}";
             exitCode = await new ProcessWrapper().RunProcess(DotNetExecutable, dotnetArgs, projectFileDirectory, testOutputHelper: outputHelper);
             Assert.True(exitCode.HasValue && exitCode.Value == 0);
             outputHelper.WriteLine($"[{DateTime.UtcNow:O}] Done.");
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ @@
     ### Microsoft.Azure.Functions.Worker.Sdk <version>
-    - <entry>
+    - Global usings added to match `Microsoft.NET.Sdk.Worker` (#2934)
     ### Microsoft.Azure.Functions.Worker.Sdk.Generators 1.3.5
@@ Expand Down @@