diff --git a/build.sh b/build.sh index 8477d5af881..84a7478bfa5 100755 --- a/build.sh +++ b/build.sh @@ -13,4 +13,4 @@ while [[ -h $source ]]; do done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" -"$scriptroot/eng/common/build.sh" --build --restore $@ +"$scriptroot/eng/common/build.sh" --restore --build $@ diff --git a/eng/Build.props b/eng/Build.props new file mode 100644 index 00000000000..25dd1f9d38b --- /dev/null +++ b/eng/Build.props @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/eng/Tools.props b/eng/Tools.props index 6d65666f935..e8cd72a378c 100644 --- a/eng/Tools.props +++ b/eng/Tools.props @@ -6,7 +6,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index d6a76b28bf4..38908392650 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -1,4 +1,3 @@ - - 10.0.0-beta.25420.121 - 10.0.0-beta.25420.121 - 10.0.0-beta.25420.121 - 10.0.0-beta.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 + 15.9.20 + 15.9.20 + 11.0.0-beta.25454.102 + 11.0.0-beta.25454.102 + 11.0.0-beta.25454.102 + 11.0.0-beta.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 10.0.0-preview.7.25317.2 + $(MicrosoftBuildFrameworkPackageVersion) + $(MicrosoftBuildUtilitiesCorePackageVersion) $(MicrosoftDotNetArcadeSdkPackageVersion) $(MicrosoftDotNetCodeAnalysisPackageVersion) $(MicrosoftDotNetGenAPIPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c708871a207..62e360c1cfa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,96 +1,104 @@ - + - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 8a6c1d81657ef04c040f598cafacf8f5a33abda2 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 + + + https://github.com/dotnet/dotnet + 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + + + https://github.com/dotnet/dotnet + 520c71b5277fc1f72dbec14da03ca55205d6c8e5 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 @@ -101,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 9303fa2ba817e93495ead20a93200dfeeff61b23 diff --git a/eng/Versions.props b/eng/Versions.props index b4e81997d15..0f9facda358 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,8 +39,6 @@ - 15.9.20 - 15.9.20 diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj index 0feda021e68..dd20b37919b 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj @@ -1,6 +1,7 @@  net472;net10.0 + false true @@ -121,11 +122,11 @@ WindowsBase\MS\Internal\IO\Packaging\CompoundFile\ContainerUtilities.cs - - PresentationCore\MS\Internal\Media\XamlSerializationHelper.cs + + PresentationCore\MS\internal\Media\XamlSerializationHelper.cs - - PresentationCore\MS\Internal\Media\ParserStreamGeometryContext.cs + + PresentationCore\MS\internal\Media\ParserStreamGeometryContext.cs PresentationCore\System\Windows\Media\StreamGeometryContext.cs