diff --git a/.github/workflows/dotnet-code-metrics.yml b/.github/workflows/dotnet-code-metrics.yml index 072aaabb046..9b20ab9ebf6 100644 --- a/.github/workflows/dotnet-code-metrics.yml +++ b/.github/workflows/dotnet-code-metrics.yml @@ -22,7 +22,7 @@ jobs: pull-requests: write steps: - - uses: actions/checkout@v4.2.2 + - uses: actions/checkout@v5.0.0 - name: 'Print manual run reason' if: ${{ github.event_name == 'workflow_dispatch' }} diff --git a/.github/workflows/markdownlint.yml b/.github/workflows/markdownlint.yml index e45ad51a749..74279c2dceb 100644 --- a/.github/workflows/markdownlint.yml +++ b/.github/workflows/markdownlint.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #@v2 + - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 #@v2 - name: Use Node.js uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 #@v1 with: diff --git a/.github/workflows/publish-mono-samples.yml b/.github/workflows/publish-mono-samples.yml index 7adb1320e89..637ccebba30 100644 --- a/.github/workflows/publish-mono-samples.yml +++ b/.github/workflows/publish-mono-samples.yml @@ -23,7 +23,7 @@ jobs: build-mono: runs-on: macos-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #@v2 + - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 #@v2 - name: Setup .NET SDK 6 if: ${{ env.DOTNET_DO_INSTALL == 'true' }} run: | diff --git a/.github/workflows/snippets5000.yml b/.github/workflows/snippets5000.yml index b3ad2257654..a9108afae7e 100644 --- a/.github/workflows/snippets5000.yml +++ b/.github/workflows/snippets5000.yml @@ -32,7 +32,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #@v4.2.2 + - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 #@v4.2.2 # Get the latest preview SDK (or sdk not installed by the runner) - name: Setup .NET SDK diff --git a/core/diagnostics/DiagnosticScenarios/DiagnosticScenarios.csproj b/core/diagnostics/DiagnosticScenarios/DiagnosticScenarios.csproj index e7c303b758e..36e7b419d29 100644 --- a/core/diagnostics/DiagnosticScenarios/DiagnosticScenarios.csproj +++ b/core/diagnostics/DiagnosticScenarios/DiagnosticScenarios.csproj @@ -1,11 +1,8 @@ - net8.0 + net9.0 + enable - - - - diff --git a/core/diagnostics/DiagnosticScenarios/Program.cs b/core/diagnostics/DiagnosticScenarios/Program.cs index 92e7964881f..7f813b3c07b 100644 --- a/core/diagnostics/DiagnosticScenarios/Program.cs +++ b/core/diagnostics/DiagnosticScenarios/Program.cs @@ -1,26 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; +var builder = WebApplication.CreateBuilder(args); +builder.Services.AddControllers(); -namespace DiagnosticScenarios -{ - public class Program - { - public static void Main(string[] args) - { - CreateHostBuilder(args).Build().Run(); - } +var app = builder.Build(); - public static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.UseStartup(); - }); - } -} +app.UseHttpsRedirection(); +app.UseAuthorization(); +app.MapControllers(); + +app.Run(); diff --git a/core/diagnostics/DiagnosticScenarios/Startup.cs b/core/diagnostics/DiagnosticScenarios/Startup.cs deleted file mode 100644 index 299b7604095..00000000000 --- a/core/diagnostics/DiagnosticScenarios/Startup.cs +++ /dev/null @@ -1,57 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.HttpsPolicy; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; - -namespace DiagnosticScenarios -{ - public class Startup - { - public Startup(IConfiguration configuration) - { - Configuration = configuration; - } - - public IConfiguration Configuration { get; } - - // This method gets called by the runtime. Use this method to add services to the container. - public void ConfigureServices(IServiceCollection services) - { - services.AddControllers() - .AddNewtonsoftJson(); - } - - // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IWebHostEnvironment env) - { - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - } - else - { - // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. - app.UseHsts(); - } - - app.UseHttpsRedirection(); - - app.UseRouting(); - - app.UseAuthorization(); - - app.UseEndpoints(endpoints => - { - endpoints.MapControllers(); - }); - } - } -} diff --git a/core/diagnostics/DiagnosticScenarios/appsettings.Development.json b/core/diagnostics/DiagnosticScenarios/appsettings.Development.json index e203e9407e7..0c208ae9181 100644 --- a/core/diagnostics/DiagnosticScenarios/appsettings.Development.json +++ b/core/diagnostics/DiagnosticScenarios/appsettings.Development.json @@ -1,9 +1,8 @@ { "Logging": { "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" + "Default": "Information", + "Microsoft.AspNetCore": "Warning" } } } diff --git a/core/diagnostics/DiagnosticScenarios/appsettings.json b/core/diagnostics/DiagnosticScenarios/appsettings.json index d9d9a9bff6f..10f68b8c8b4 100644 --- a/core/diagnostics/DiagnosticScenarios/appsettings.json +++ b/core/diagnostics/DiagnosticScenarios/appsettings.json @@ -2,8 +2,7 @@ "Logging": { "LogLevel": { "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" + "Microsoft.AspNetCore": "Warning" } }, "AllowedHosts": "*" diff --git a/core/extensions/OutOfProcCOM/Server.Contract/Contract.idl b/core/extensions/OutOfProcCOM/Server.Contract/Contract.idl index d758caf5c8b..b6c38685118 100644 --- a/core/extensions/OutOfProcCOM/Server.Contract/Contract.idl +++ b/core/extensions/OutOfProcCOM/Server.Contract/Contract.idl @@ -4,6 +4,7 @@ import "ocidl.idl"; [ object, oleautomation, + dual, uuid(F586D6F4-AF37-441E-80A6-3D33D977882D) ] interface IServer : IDispatch diff --git a/msbuild/custom-task-code-generation/AppSettingStronglyTyped/AppSettingStronglyTyped/AppSettingStronglyTyped.csproj b/msbuild/custom-task-code-generation/AppSettingStronglyTyped/AppSettingStronglyTyped/AppSettingStronglyTyped.csproj index a42b8db5731..818d1d228ff 100644 --- a/msbuild/custom-task-code-generation/AppSettingStronglyTyped/AppSettingStronglyTyped/AppSettingStronglyTyped.csproj +++ b/msbuild/custom-task-code-generation/AppSettingStronglyTyped/AppSettingStronglyTyped/AppSettingStronglyTyped.csproj @@ -8,22 +8,27 @@ Generates a strongly typed setting class base on a txt file MyTags Copyright ©Contoso 2022 - + + true + true + $(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage tasks NU5100 + true embedded true - + + PrivateAssets="all" + ExcludeAssets="Runtime" /> - +