Skip to content

[main] Update dependencies from dotnet/runtime #24195

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

Merged
merged 21 commits into from
Mar 9, 2022
Merged

[main] Update dependencies from dotnet/runtime #24195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
a1e5bd6
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Mar 3, 2022
7497817
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Mar 4, 2022
b50b86f
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Mar 5, 2022
fd98526
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Mar 6, 2022
3bd22cd
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Mar 7, 2022
1a4d13e
Update global.json
marcpopMSFT Mar 7, 2022
2ac6a64
Update restore-toolset.sh
marcpopMSFT Mar 7, 2022
bc3e2fc
Update restore-toolset.ps1
marcpopMSFT Mar 7, 2022
05e7d29
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Mar 8, 2022
6d9dd98
Update Versions.props
wtgodbe Mar 8, 2022
5f24844
Merge branch 'main' into darc-main-4e4c3a83-79d4-4dbf-a084-18667262c049
wtgodbe Mar 8, 2022
5b2b048
Update redist.csproj
wtgodbe Mar 8, 2022
39fe197
Update global.json
wtgodbe Mar 8, 2022
7bb8ead
Merge branch 'main' into darc-main-4e4c3a83-79d4-4dbf-a084-18667262c049
marek-safar Mar 9, 2022
91943c8
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Mar 9, 2022
9c76c20
Update ReferenceExeTests.cs
wtgodbe Mar 9, 2022
e90f350
Update Versions.props
wtgodbe Mar 9, 2022
cfc8f5c
Update WorkloadTests.cs
wtgodbe Mar 9, 2022
bc1ce27
Update baselines
javiercn Mar 9, 2022
d15aedf
Update SourceBuild.props
wtgodbe Mar 9, 2022
b8723c0
Merge branch 'main' into darc-main-4e4c3a83-79d4-4dbf-a084-18667262c049
wtgodbe Mar 9, 2022
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
2 changes: 1 addition & 1 deletion eng/SourceBuild.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<GitHubRepositoryName>sdk</GitHubRepositoryName>
<SourceBuildManagedOnly>true</SourceBuildManagedOnly>
</PropertyGroup>

<Target Name="ConfigureInnerBuildArg" BeforeTargets="GetSourceBuildCommandConfiguration">
<PropertyGroup>
<InnerBuildArgs>$(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\source-build.slnf"</InnerBuildArgs>
<InnerBuildArgs>$(InnerBuildArgs) /p:UseSharedCompilation=false</InnerBuildArgs>
</PropertyGroup>
</Target>

Expand Down
56 changes: 28 additions & 28 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,41 +26,41 @@
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>c30b2dca81bec3f510cc2fd7c77d9c5384bb2204</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.3.22151.6">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.3.22158.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>2330b4bef645bf8bcd3011f35968e55192c697f5</Sha>
<Sha>8342a08b8bf0ff2ffb64cd5992e2d60c8d6d63c1</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-preview.3.22151.6">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-preview.3.22158.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>2330b4bef645bf8bcd3011f35968e55192c697f5</Sha>
<Sha>8342a08b8bf0ff2ffb64cd5992e2d60c8d6d63c1</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-preview.3.22151.6">
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-preview.3.22158.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>2330b4bef645bf8bcd3011f35968e55192c697f5</Sha>
<Sha>8342a08b8bf0ff2ffb64cd5992e2d60c8d6d63c1</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-preview.3.22151.6">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-preview.3.22158.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>2330b4bef645bf8bcd3011f35968e55192c697f5</Sha>
<Sha>8342a08b8bf0ff2ffb64cd5992e2d60c8d6d63c1</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-preview.3.22151.6">
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-preview.3.22158.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>2330b4bef645bf8bcd3011f35968e55192c697f5</Sha>
<Sha>8342a08b8bf0ff2ffb64cd5992e2d60c8d6d63c1</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-preview.3.22151.6">
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-preview.3.22158.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>2330b4bef645bf8bcd3011f35968e55192c697f5</Sha>
<Sha>8342a08b8bf0ff2ffb64cd5992e2d60c8d6d63c1</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.HostModel" Version="7.0.0-preview.3.22151.6">
<Dependency Name="Microsoft.NET.HostModel" Version="7.0.0-preview.3.22158.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>2330b4bef645bf8bcd3011f35968e55192c697f5</Sha>
<Sha>8342a08b8bf0ff2ffb64cd5992e2d60c8d6d63c1</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="7.0.0-preview.3.22151.6">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="7.0.0-preview.3.22158.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>2330b4bef645bf8bcd3011f35968e55192c697f5</Sha>
<Sha>8342a08b8bf0ff2ffb64cd5992e2d60c8d6d63c1</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-preview.3.22151.6">
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-preview.3.22158.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>2330b4bef645bf8bcd3011f35968e55192c697f5</Sha>
<Sha>8342a08b8bf0ff2ffb64cd5992e2d60c8d6d63c1</Sha>
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.2.0-preview-22154-03">
<Uri>https://github.com/dotnet/msbuild</Uri>
Expand Down Expand Up @@ -134,21 +134,21 @@
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>e003f2c4e13a1d89279afa4d655c6a15feac18b5</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="7.0.0-preview.3.22151.6">
<Dependency Name="System.CodeDom" Version="7.0.0-preview.3.22158.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>2330b4bef645bf8bcd3011f35968e55192c697f5</Sha>
<Sha>8342a08b8bf0ff2ffb64cd5992e2d60c8d6d63c1</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="7.0.0-preview.3.22151.6">
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="7.0.0-preview.3.22158.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>2330b4bef645bf8bcd3011f35968e55192c697f5</Sha>
<Sha>8342a08b8bf0ff2ffb64cd5992e2d60c8d6d63c1</Sha>
</Dependency>
<Dependency Name="System.Text.Encoding.CodePages" Version="7.0.0-preview.3.22151.6">
<Dependency Name="System.Text.Encoding.CodePages" Version="7.0.0-preview.3.22158.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>2330b4bef645bf8bcd3011f35968e55192c697f5</Sha>
<Sha>8342a08b8bf0ff2ffb64cd5992e2d60c8d6d63c1</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="7.0.0-preview.3.22151.6">
<Dependency Name="System.Resources.Extensions" Version="7.0.0-preview.3.22158.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>2330b4bef645bf8bcd3011f35968e55192c697f5</Sha>
<Sha>8342a08b8bf0ff2ffb64cd5992e2d60c8d6d63c1</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.0-preview.3.22159.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
Expand Down Expand Up @@ -285,9 +285,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>81001b45bd54f9223905bf55f6ed0125273580fa</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="7.0.0-preview.3.22151.6">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="7.0.0-preview.3.22158.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>2330b4bef645bf8bcd3011f35968e55192c697f5</Sha>
<Sha>8342a08b8bf0ff2ffb64cd5992e2d60c8d6d63c1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22154.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
Expand Down
24 changes: 13 additions & 11 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<!-- Opt out of certain Arcade features -->
<PropertyGroup>
<UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies>
<UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
</PropertyGroup>
<!-- Repo Version Information -->
<PropertyGroup>
Expand All @@ -29,26 +30,26 @@
<SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
<MicrosoftDotNetSignToolVersion>7.0.0-beta.22157.6</MicrosoftDotNetSignToolVersion>
<MicrosoftWebXdtPackageVersion>3.1.0</MicrosoftWebXdtPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>7.0.0-preview.3.22151.6</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>7.0.0-preview.3.22158.2</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
<SystemTextJsonVersion>6.0.0</SystemTextJsonVersion>
<SystemReflectionMetadataLoadContextVersion>7.0.0-preview.3.22151.6</SystemReflectionMetadataLoadContextVersion>
<SystemReflectionMetadataLoadContextVersion>7.0.0-preview.3.22158.2</SystemReflectionMetadataLoadContextVersion>
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
<SystemCommandLineVersion>2.0.0-beta3.22157.1</SystemCommandLineVersion>
<MicrosoftDeploymentDotNetReleasesVersion>1.0.0-preview3.6.22115.1</MicrosoftDeploymentDotNetReleasesVersion>
<MicrosoftVisualStudioSetupConfigurationInteropVersion>3.0.4496</MicrosoftVisualStudioSetupConfigurationInteropVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.3.22151.6</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-preview.3.22151.6</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-preview.3.22151.6</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.3.22158.2</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-preview.3.22158.2</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-preview.3.22158.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>7.0.0-preview.3.22151.6</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-preview.3.22151.6</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>7.0.0-preview.3.22151.6</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>7.0.0-preview.3.22158.2</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-preview.3.22158.2</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>7.0.0-preview.3.22158.2</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>6.0.0-preview.7.21363.9</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
</PropertyGroup>
Expand Down Expand Up @@ -82,9 +83,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<SystemCodeDomPackageVersion>7.0.0-preview.3.22151.6</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>7.0.0-preview.3.22151.6</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>7.0.0-preview.3.22151.6</SystemResourcesExtensionsPackageVersion>
<SystemCodeDomPackageVersion>7.0.0-preview.3.22158.2</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>7.0.0-preview.3.22158.2</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>7.0.0-preview.3.22158.2</SystemResourcesExtensionsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/format -->
Expand Down Expand Up @@ -128,6 +129,7 @@
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.2.0-2.22158.15</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.2.0-2.22158.15</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.2.0-2.22158.15</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftNetCompilersToolsetVersion>$(MicrosoftNetCompilersToolsetPackageVersion)</MicrosoftNetCompilersToolsetVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
Expand Down
2 changes: 1 addition & 1 deletion eng/restore-toolset.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function InitializeCustomSDKToolset {
InstallDotNetSharedFramework "2.2.8"
InstallDotNetSharedFramework "3.1.0"
InstallDotNetSharedFramework "5.0.0"
InstallDotNetSharedFramework "6.0.0-rc.2.21452.2"
InstallDotNetSharedFramework "6.0.0"

CreateBuildEnvScripts
InstallNuget
Expand Down
2 changes: 1 addition & 1 deletion eng/restore-toolset.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function InitializeCustomSDKToolset {
InstallDotNetSharedFramework "2.2.8"
InstallDotNetSharedFramework "3.1.0"
InstallDotNetSharedFramework "5.0.0"
InstallDotNetSharedFramework "6.0.0-rc.2.21452.2"
InstallDotNetSharedFramework "6.0.0"

CreateBuildEnvScript
}
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "7.0.100-alpha.1.21478.48",
"dotnet": "7.0.100-preview.3.22158.2",
"runtimes": {
"dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)"
Expand Down
1 change: 0 additions & 1 deletion src/Layout/redist/redist.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
<PackageReference Include="Microsoft.TestPlatform.Build" Version="$(MicrosoftTestPlatformBuildPackageVersion)" />
<PackageReference Condition=" '$(DotNetBuildFromSource)' != 'true' " Include="NuGet.Localization" Version="$(NuGetLocalizationPackageVersion)" />
<PackageReference Include="NuGet.ProjectModel" Version="$(NuGetProjectModelPackageVersion)" />
<PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" ExcludeAssets="All" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" ExcludeAssets="All" GeneratePathProperty="true" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" ExcludeAssets="All" GeneratePathProperty="true" />
<PackageReference Include="Microsoft.CodeAnalysis.Features" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" ExcludeAssets="All" GeneratePathProperty="true" />
Expand Down
2 changes: 1 addition & 1 deletion src/Tests/Microsoft.NET.Build.Tests/ReferenceExeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ public void ExeProjectCanReferenceTestProject(string testTemplateName)
var testConsoleProject = new TestProject("ConsoleApp")
{
IsExe = true,
TargetFrameworks = "net6.0",
TargetFrameworks = "net7.0",
RuntimeIdentifier = EnvironmentInfo.GetCompatibleRid()
};

Expand Down
2 changes: 1 addition & 1 deletion src/Tests/Microsoft.NET.Build.Tests/WorkloadTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ public void It_should_get_suggested_workload_by_GetRequiredWorkloads_target()
.BeEquivalentTo("android");
}

[Theory]
[Theory(Skip = "https://github.com/dotnet/installer/issues/13361")]
[InlineData("net6.0-android;net6.0-ios", "net6.0-android;net6.0-ios", "android;android-aot")]
[InlineData("net6.0", "net6.0;net6.0-android;net6.0-ios", "macos;android-aot")]
[InlineData("net6.0;net6.0-ios", "net6.0;net6.0-android", "macos;android-aot")]
Expand Down
2 changes: 1 addition & 1 deletion ...ts/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.files.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,4 +448,4 @@
"${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\blazorwasm-minimal.dll",
"${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\netstandard.dll",
"${ProjectPath}\\obj\\Debug\\${Tfm}\\publish.extension.txt"
]
]
2 changes: 1 addition & 1 deletion ...ebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.staticwebassets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3859,4 +3859,4 @@
"OriginalItemSpec": "wwwroot\\index.html"
}
]
}
}
2 changes: 1 addition & 1 deletion ...ticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.files.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,4 +442,4 @@
"${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\System.dll",
"${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\blazorwasm-minimal.dll",
"${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\netstandard.dll"
]
]
2 changes: 1 addition & 1 deletion ...tsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.staticwebassets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3808,4 +3808,4 @@
"OriginalItemSpec": "wwwroot\\index.html"
}
]
}
}
2 changes: 1 addition & 1 deletion ...icWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.files.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,4 +236,4 @@
"${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\index.html",
"${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\serviceworkers\\my-service-worker.js",
"${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\jsmodules\\jsmodules.publish.manifest.json"
]
]
2 changes: 1 addition & 1 deletion ...sBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.staticwebassets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4059,4 +4059,4 @@
"OriginalItemSpec": "wwwroot\\wwwroot\\exampleJsInterop.js"
}
]
}
}
6 changes: 3 additions & 3 deletions ...BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.files.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@
"${OutputPath}\\wwwroot\\_framework\\blazor.webassembly.js",
"${OutputPath}\\wwwroot\\_framework\\blazor.webassembly.js.br",
"${OutputPath}\\wwwroot\\_framework\\blazor.webassembly.js.gz",
"${OutputPath}\\wwwroot\\_framework\\dotnet.6.0.0-rc.2.21452.2.[[hash]].js",
"${OutputPath}\\wwwroot\\_framework\\dotnet.6.0.0-rc.2.21452.2.[[hash]].js.br",
"${OutputPath}\\wwwroot\\_framework\\dotnet.6.0.0-rc.2.21452.2.[[hash]].js.gz",
"${OutputPath}\\wwwroot\\_framework\\dotnet.6.0.2.[[hash]].js",
"${OutputPath}\\wwwroot\\_framework\\dotnet.6.0.2.[[hash]].js.br",
"${OutputPath}\\wwwroot\\_framework\\dotnet.6.0.2.[[hash]].js.gz",
"${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat",
"${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.br",
"${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.gz",
Expand Down
Loading