Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify project files round 1 #10737

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Simplify project files round 1 #10737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion eng/build/Engineering.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 1 addition & 5 deletions src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
79 changes: 27 additions & 52 deletions src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,47 +1,53 @@
<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>
<PublishReadyToRunComposite>true</PublishReadyToRunComposite>
<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>
Expand Down Expand Up @@ -71,48 +77,17 @@
<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" />
<PackageReference Include="System.Memory.Data" Version="8.0.1" />
<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>
13 changes: 0 additions & 13 deletions src/WebJobs.Script.WebHost/applicationHost.xdt
View file
Open in desktop
jviau marked this conversation as resolved.
Show resolved Hide resolved

This file was deleted.

6 changes: 3 additions & 3 deletions src/WebJobs.Script/FileProvisioning/PowerShell/PowerShellFileProvisioner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
17 changes: 7 additions & 10 deletions src/WebJobs.Script/WebJobs.Script.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,29 @@
<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" />
<None Remove="runtimeassemblies-relaxed.json" />
<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" />
Expand Down
Loading