From 09766a278dc48eae1ed8c94d620ab7218c124891 Mon Sep 17 00:00:00 2001
From: Jacob Viau <javia@microsoft.com>
Date: Mon, 13 Jan 2025 13:47:41 -0800
Subject: [PATCH] Simplify project files round 1

---
 eng/build/Engineering.props                   |  3 +-
 .../WebJobs.Script.Grpc.csproj                |  6 +-
 .../WebJobs.Script.WebHost.csproj             | 79 +++++++------------
 .../applicationHost.xdt                       | 13 ---
 .../PowerShell/PowerShellFileProvisioner.cs   |  6 +-
 src/WebJobs.Script/WebJobs.Script.csproj      | 17 ++--
 6 files changed, 40 insertions(+), 84 deletions(-)
 delete mode 100644 src/WebJobs.Script.WebHost/applicationHost.xdt

diff --git a/eng/build/Engineering.props b/eng/build/Engineering.props
index b34680919f..796658a032 100644
--- a/eng/build/Engineering.props
+++ b/eng/build/Engineering.props
@@ -19,10 +19,11 @@
     <LangVersion>latest</LangVersion>
     <AssemblyOriginatorKeyFile>$(EngResourceRoot)key.snk</AssemblyOriginatorKeyFile>
     <CodeAnalysisRuleSet>$(RepoRoot)src.ruleset</CodeAnalysisRuleSet>
-    <NoWarn>$(NoWarn);NU1701</NoWarn>
+    <NoWarn>$(NoWarn);NU1701;NU5104</NoWarn>
     <DebugType>embedded</DebugType>
     <GenerateRuntimeConfigDevFile>true</GenerateRuntimeConfigDevFile><!-- https://github.com/dotnet/runtime/issues/54684 -->
     <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj b/src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj
index 156b6ec6e6..c69ae9e559 100644
--- a/src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj
+++ b/src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj
@@ -5,8 +5,6 @@
     <PackageId>Microsoft.Azure.WebJobs.Script.Grpc</PackageId>
     <AssemblyName>Microsoft.Azure.WebJobs.Script.Grpc</AssemblyName>
     <RootNamespace>Microsoft.Azure.WebJobs.Script.Grpc</RootNamespace>
-    <Ext Condition="'$(OS)' == 'Windows_NT'">bat</Ext>
-    <Ext Condition="'$(OS)' != 'Windows_NT'">sh</Ext>
   </PropertyGroup>
 
   <ItemGroup>
@@ -18,9 +16,7 @@
     <PackageReference Include="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" Version="2.22.0" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Rpc.Core" Version="3.0.37" />
     <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" PrivateAssets="all" />
     <PackageReference Include="System.Threading.Channels" Version="8.0.0" />
     <PackageReference Include="Yarp.ReverseProxy" Version="2.0.1" />
   </ItemGroup>
diff --git a/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj b/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj
index e28863a1f1..56d6fe16d1 100644
--- a/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj
+++ b/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <Import Project="$(WorkersProps)" />
+
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
+    <RuntimeIdentifiers>win-x86;win-x64;linux-x64</RuntimeIdentifiers>
     <AssemblyName>Microsoft.Azure.WebJobs.Script.WebHost</AssemblyName>
     <RootNamespace>Microsoft.Azure.WebJobs.Script.WebHost</RootNamespace>
     <PackageId>Microsoft.Azure.WebJobs.Script.WebHost</PackageId>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <TieredCompilation>false</TieredCompilation>
-    <NoWarn>NU5104</NoWarn>
     <IdentityDependencyVersion>6.35.0</IdentityDependencyVersion>
-    <RuntimeIdentifiers>win-x86;win-x64;linux-x64</RuntimeIdentifiers>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <UserSecretsId>dc316708-c8c1-4ef1-90b3-19eb512d96f3</UserSecretsId>
   </PropertyGroup>
+
   <PropertyGroup Condition="'$(RuntimeIdentifier)' != ''">
     <PublishReadyToRun>true</PublishReadyToRun>
     <PublishReadyToRunUseCrossgen2>true</PublishReadyToRunUseCrossgen2>
@@ -20,28 +20,34 @@
     <PublishReadyToRunEmitSymbols>true</PublishReadyToRunEmitSymbols>
     <PublishReadyToRunShowWarnings>true</PublishReadyToRunShowWarnings>
   </PropertyGroup>
+
   <ItemGroup>
-    <Content Remove="Resources\Functions\host.json" />
-    <Content Remove="Resources\Functions\proxies.json" />
-    <Content Remove="Resources\Functions\WarmUp\function.json" />
+    <None Remove="PreJIT\*.jittrace" />
+    <None Remove="Resources\**" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Remove="applicationHost.xdt" />
-    <None Remove="PreJIT\linux.coldstart.jittrace" />
-    <None Remove="Resources\app_offline.htm" />
-    <None Remove="Resources\Functions\WarmUp\run.csx" />
-    <None Remove="PreJIT\coldstart.jittrace" />
+    <Content Remove="Resources\**" />
+    <Content Include="PreJIT\*.jittrace" CopyToOutputDirectory="PreserveNewest" />
+    <Content Update="web.config" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
+
   <ItemGroup>
-    <Content Include="applicationHost.xdt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="PreJIT\coldstart.jittrace">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="PreJIT\linux.coldstart.jittrace">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
+    <Compile Remove="Middleware\SpecializationSimulatorMiddleware.cs" Condition="'$(PlaceholderSimulation)' != 'true'" />
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Home.html" />
+    <EmbeddedResource Include="Resources\**" />
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
   </ItemGroup>
 
   <ItemGroup>
@@ -71,7 +77,7 @@
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="$(IdentityDependencyVersion)" />
 
     <!--
-      System.IO.FileSystem.AccessControl/5.0.0 pinned to avoid an unintented downgrade to 4.7.0.
+      System.IO.FileSystem.AccessControl/5.0.0 pinned to avoid an unintended downgrade to 4.7.0.
       See https://github.com/Azure/azure-functions-host/pull/10002
     -->
     <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
@@ -79,40 +85,9 @@
     <PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="Home.html" />
-    <EmbeddedResource Include="Resources\app_offline.htm" />
-    <EmbeddedResource Include="Resources\Functions\host.json" />
-    <EmbeddedResource Include="Resources\Functions\proxies.json" />
-    <EmbeddedResource Include="Resources\Functions\WarmUp\function.json" />
-    <EmbeddedResource Include="Resources\Functions\WarmUp\run.csx" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\WebJobs.Script\WebJobs.Script.csproj" />
     <ProjectReference Include="..\WebJobs.Script.Grpc\WebJobs.Script.Grpc.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(PlaceholderSimulation)' != 'true'">
-    <Compile Remove="Middleware\SpecializationSimulatorMiddleware.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Update="web.config" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/WebJobs.Script.WebHost/applicationHost.xdt b/src/WebJobs.Script.WebHost/applicationHost.xdt
deleted file mode 100644
index 1344402c99..0000000000
--- a/src/WebJobs.Script.WebHost/applicationHost.xdt
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <system.applicationHost>
-    <sites>
-      <site name="%XDT_SITENAME%" xdt:Locator="Match(name)">
-        <application path="/" xdt:Locator="Match(path)" xdt:Transform="Remove" />
-        <application path="/" applicationPool="%XDT_APPPOOLNAME%" xdt:Transform="Insert">
-          <virtualDirectory path="/" physicalPath="%XDT_EXTENSIONPATH%\%XDT_BITNESS%" />
-        </application>  
-      </site>
-    </sites>
-  </system.applicationHost>
-</configuration>
diff --git a/src/WebJobs.Script/FileProvisioning/PowerShell/PowerShellFileProvisioner.cs b/src/WebJobs.Script/FileProvisioning/PowerShell/PowerShellFileProvisioner.cs
index 33b87a620b..f32a42f5f7 100644
--- a/src/WebJobs.Script/FileProvisioning/PowerShell/PowerShellFileProvisioner.cs
+++ b/src/WebJobs.Script/FileProvisioning/PowerShell/PowerShellFileProvisioner.cs
@@ -35,10 +35,10 @@ public PowerShellFileProvisioner(ILoggerFactory loggerFactory)
         }
 
         /// <summary>
-        /// Adds the required files to the function app
+        /// Adds the required files to the function app.
         /// </summary>
-        /// <param name="scriptRootPath">The root path of the function app</param>
-        /// <returns>An empty completed task <see cref="Task"/></returns>
+        /// <param name="scriptRootPath">The root path of the function app.</param>
+        /// <returns>An empty completed task <see cref="Task"/>.</returns>
         public Task ProvisionFiles(string scriptRootPath)
         {
             if (string.IsNullOrWhiteSpace(scriptRootPath))
diff --git a/src/WebJobs.Script/WebJobs.Script.csproj b/src/WebJobs.Script/WebJobs.Script.csproj
index 79038f1e08..8b18b9bc20 100644
--- a/src/WebJobs.Script/WebJobs.Script.csproj
+++ b/src/WebJobs.Script/WebJobs.Script.csproj
@@ -1,11 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <PackageId>Microsoft.Azure.WebJobs.Script</PackageId>
     <AssemblyName>Microsoft.Azure.WebJobs.Script</AssemblyName>
     <RootNamespace>Microsoft.Azure.WebJobs.Script</RootNamespace>
-    <NoWarn>NU5104</NoWarn>
   </PropertyGroup>
+
   <ItemGroup>
     <None Remove="FileProvisioning\PowerShell\profile.ps1" />
     <None Remove="FileProvisioning\PowerShell\requirements.psd1" />
@@ -13,20 +14,16 @@
     <None Remove="runtimeassemblies.json" />
     <None Remove="runtimes.json" />
   </ItemGroup>
+
   <ItemGroup>
-    <EmbeddedResource Include="extensionrequirements.json">
-      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-    </EmbeddedResource>
+    <EmbeddedResource Include="extensionrequirements.json" CopyToOutputDirectory="Never" />
     <EmbeddedResource Include="FileProvisioning\PowerShell\profile.ps1" />
     <EmbeddedResource Include="FileProvisioning\PowerShell\requirements.psd1" />
-    <EmbeddedResource Include="runtimeassemblies-relaxed.json">
-      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-    </EmbeddedResource>
-    <EmbeddedResource Include="runtimeassemblies.json">
-      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-    </EmbeddedResource>
+    <EmbeddedResource Include="runtimeassemblies-relaxed.json" CopyToOutputDirectory="Never" />
+    <EmbeddedResource Include="runtimeassemblies.json" CopyToOutputDirectory="Never" />
     <EmbeddedResource Include="runtimes.json" />
   </ItemGroup>
+
   <ItemGroup>
     <!-- Dependencies needed for Storage Providers -->
     <PackageReference Include="Azure.Core" Version="1.38.0" />