diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9bbbe2308cb301..91520aa4c7d75a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,14 +64,14 @@ 526b22d829bc9b420dff6ef70877a67053b66e0f - + https://github.com/dotnet/emsdk - 530feeca3813957c21b096ac371a1cf98ac11b76 + affb1823f4444a47529d649689a7a9b955fedf95 - + https://github.com/dotnet/emsdk - 530feeca3813957c21b096ac371a1cf98ac11b76 + affb1823f4444a47529d649689a7a9b955fedf95 diff --git a/eng/Versions.props b/eng/Versions.props index a9f6cd467e8bc2..44d3555b2c0c6c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,7 +6,7 @@ 10 0 0 - 9.0.100 + $(MajorVersion).0.100 8.0.8 7.0.20 6.0.$([MSBuild]::Add($([System.Version]::Parse('$(PackageVersionNet8)').Build),25)) @@ -237,8 +237,8 @@ Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-9_0_100_Transport --> - 10.0.0-alpha.1.24461.1 - $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion) + 10.0.0-alpha.1.24468.9 + $(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion) 1.1.87-gba258badda 1.0.0-v3.14.0.5722 @@ -255,8 +255,7 @@ 3.1.7 1.0.406601 - - 9.0.100-rc.1.24452.12 + $(MicrosoftDotNetApiCompatTaskVersion) 9.0.0-alpha.1.24175.1 $(MicrosoftNETRuntimeEmscriptenVersion) $(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion) diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index 6b1804c9afcafe..e5a9638504632c 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -114,7 +114,7 @@ jobs: - ${{ if eq(parameters.archType, 'wasm') }}: - name: wasmDarcDependenciesChanged value: $[ or( - eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-9_0_100_Transport'], true), + eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-10_0_100_Transport'], true), eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['DarcDependenciesChanged.Microsoft_DotNet_Build_Tasks_Workloads'], true), eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['DarcDependenciesChanged.System_Runtime_TimeZoneData'], true), eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['DarcDependenciesChanged.Microsoft_Net_Compilers_Toolset'], true), diff --git a/eng/testing/workloads-testing.targets b/eng/testing/workloads-testing.targets index 9344877d7ca6e4..4c21756db44e40 100644 --- a/eng/testing/workloads-testing.targets +++ b/eng/testing/workloads-testing.targets @@ -8,17 +8,17 @@ $([MSBuild]::NormalizeDirectory($(ArtifactsDir), 'packages', $(Configuration), 'Shipping')) $(_DotNetInstallScriptPath) -i $(_SdkWithNoWorkloadPath) -v latest -q daily --channel 9.0 + >$(_DotNetInstallScriptPath) -i $(_SdkWithNoWorkloadPath) -v latest -q daily --channel 10.0 $(_DotNetInstallScriptPath) -InstallDir $(_SdkWithNoWorkloadPath) -Quality daily -Channel 9.0 + >$(_DotNetInstallScriptPath) -InstallDir $(_SdkWithNoWorkloadPath) -Quality daily -Channel 10.0 $(SdkBandVersionForWorkload_FromRuntimeVersions) - - + + @@ -38,10 +38,16 @@ + + diff --git a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs index 0427f1ba436ddd..ae0aa55c4e15f2 100644 --- a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs +++ b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs @@ -288,6 +288,12 @@ private bool InstallWorkloadManifest(ITaskItem workloadId, string name, string v string outputDir = FindSubDirIgnoringCase(manifestVersionBandDir, name); + if (!Directory.Exists(outputDir)) + { + Log.LogMessage($"Could not find {name} directory at {outputDir}. Creating it.."); + Directory.CreateDirectory(outputDir); + } + // If we one sub entry, it's workload manifest version and we should install into it (aka workload sets) string[] outputSubEntries = Directory.GetFileSystemEntries(outputDir); if (outputSubEntries.Length == 1)