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.

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

Update assembly version from hardcoded to MajorVersion #74157

Merged
merged 23 commits into from
Nov 2, 2022

Commits on Oct 19, 2022

  1. Configuration menu
    Copy the full SHA
    b985a5d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    371465c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6ef101c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0780ab4 View commit details
    Browse the repository at this point in the history
  5. Manually generate the TestData.resources.

    The dotnet exec command generated by the msbuild Target had to be manually executed in the cmdline with the target framework folders for RemoteExecutor hardcoded to net7.0-windows so the resources file could be generated.
    carlossanlop committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    b27254a View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    727f422 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2022

  1. Configuration menu
    Copy the full SHA
    2ae65a5 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2022

  1. Configuration menu
    Copy the full SHA
    cefdcea View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4040569 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c906e67 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    7085bbf View commit details
    Browse the repository at this point in the history
  5. Retrieve major version dynamically for expected message in SurrogateP…

    …rovider_MemberData
    carlossanlop authored and radical committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    72a9121 View commit details
    Browse the repository at this point in the history
  6. Manually generate the TestData.resources.

    The dotnet exec command generated by the msbuild Target had to be manually executed in the cmdline with the target framework folders for RemoteExecutor hardcoded to net7.0-windows so the resources file could be generated.
    carlossanlop authored and radical committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    9b7515e View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    38ef5be View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    d760fa5 View commit details
    Browse the repository at this point in the history
  9. Extract the LocalEchoServer bits from the projects

    .. so that the helix bits are in a LocalEchoServer.helix.targets ,
    instead of being special-cased in sendtohelix-wasm.targets .
    - And this is setup and used by the test projects by importing one file.
    radical committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    d3bfb56 View commit details
    Browse the repository at this point in the history
  10. Build the LocalEchoServers specifically without using artifacts .

    - The RemoteLoopServer, and NetCoreServer are projects used as aspnetcore
    middleware, and loaded by xharness.
    - These are built against the live artifacts, same as other projects.
        - But this can be a problem when the libraries in `runtime` are on a
        newer assembly version (say `8.0.0`), but xharness is still built with
        `7.0.0` libraries.
        - In that case, xharness fails to load the middleware:
    
    ```
    Application startup exception: System.Reflection.ReflectionTypeLoadException: Unable to load one or more of the requested types.
    
    ...
    
    Could not load file or assembly 'System.Runtime, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'. The system cannot find the file specified.
    
       at System.Reflection.RuntimeModule.GetTypes(RuntimeModule module)
       at System.Reflection.Assembly.GetTypes()
       at Microsoft.DotNet.XHarness.CLI.CommandArguments.TypeFromAssemblyArgument`1.GetLoadedTypes()+MoveNext() in /_/src/Microsoft.DotNet.XHarness.CLI/CommandArguments/Arguments/TypeFromAssemblyArgument.cs:line 29
       at Microsoft.DotNet.XHarness.CLI.Commands.WebServer.<>c__DisplayClass0_0.<Start>b__9(TestWebServerOptions options) in /_/src/Microsoft.DotNet.XHarness.CLI/Commands/WebServer.cs:line 60
       at Microsoft.Extensions.Options.OptionsFactory`1.Create(String name)
       at Microsoft.Extensions.Options.OptionsCache`1.<>c__3`1.<GetOrAdd>b__3_0(String name, ValueTuple`2 arg)
       at System.Collections.Concurrent.ConcurrentDictionary`2.GetOrAdd[TArg](TKey key, Func`3 valueFactory, TArg factoryArgument)
       at Microsoft.Extensions.Options.OptionsCache`1.GetOrAdd[TArg](String name, Func`3 createOptions, TArg factoryArgument)
       at Microsoft.DotNet.XHarness.CLI.Commands.WebServer.TestWebServerStartup.Configure(IApplicationBuilder app, IOptionsMonitor`1 optionsAccessor) in /_/src/Microsoft.DotNet.XHarness.CLI/Commands/WebServer.cs:line 126
       at System.RuntimeMethodHandle.InvokeMethod(Object target, Void** arguments, Signature sig, Boolean isConstructor)
       at System.Reflection.MethodInvoker.Invoke(Object obj, IntPtr* args, BindingFlags invokeAttr)
       at System.Reflection.RuntimeMethodInfo.Invoke(Object obj, BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture)
       at Microsoft.AspNetCore.Hosting.ConfigureBuilder.Invoke(Object instance, IApplicationBuilder builder)
       at Microsoft.AspNetCore.Hosting.ConventionBasedStartup.Configure(IApplicationBuilder app)
       at Microsoft.AspNetCore.Hosting.WebHost.BuildApplication()
    ```
    
    - Build the project in isolation from rest of the repo, so that it is
    built with references only from the SDK. The built assembly can then be
    deployed for use with xharness, just like before.
    radical committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    63fe2dc View commit details
    Browse the repository at this point in the history
  11. add missing files

    radical committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    0ba793c View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    8199b4b View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    ad3c98a View commit details
    Browse the repository at this point in the history
  14. [wasm] Avoid duplicate imports, and don't use the targetingpacks.targets

    .. for runtime tests since the paths are set explicitly in the project
    radical committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    5651091 View commit details
    Browse the repository at this point in the history
  15. [wasm] Workaround for dotnet#77707

    The middleware projects are now being built separately, so they can
    target a different TFM. But when `RunAOTCompilation=true` is set, like
    on CI/AOT builds, the build breaks with:
    
    ```
    To build this project, the following workloads must be installed: macos [/__w/1/s/Build.proj]
    To install these workloads, run the following command: dotnet workload restore [/__w/1/s/Build.proj]
    ```
    
    This is described in dotnet#77707 .
    And the issue is present in `7.0 rc1` also, which is currently used for
    building the repo. To workaround it, we unset some properties which
    aren't needed anyway for the middleware projects builds.
    radical committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    fcc492e View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    889650f View commit details
    Browse the repository at this point in the history