diff --git a/NuGet.config b/NuGet.config index 9eb6d782fef5..89bbecaf0641 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,23 +4,27 @@ + + - + + + @@ -47,14 +51,24 @@ + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 871a1f0868c6..33a794c01eb2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,58 +14,58 @@ 7994f94ec4071d4803af1b4f75f4ba964d3391f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 + 77545d6fd5ca79bc08198fd6d8037c14843f14ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 + 77545d6fd5ca79bc08198fd6d8037c14843f14ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 + 77545d6fd5ca79bc08198fd6d8037c14843f14ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 + 77545d6fd5ca79bc08198fd6d8037c14843f14ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 + 77545d6fd5ca79bc08198fd6d8037c14843f14ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 + 77545d6fd5ca79bc08198fd6d8037c14843f14ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 + 77545d6fd5ca79bc08198fd6d8037c14843f14ad https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 + 77545d6fd5ca79bc08198fd6d8037c14843f14ad - + https://github.com/dotnet/emsdk - adc0d6e7d3abb9c4ecee2420c51ae99c57dc9755 + 2b0cca8ad3a88e02fe0878139009ffffde071f1f - - https://github.com/dotnet/msbuild - 7c941d28e61c76de665b1e008ea34ea667cdfead + + https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted + 27f9d42f6ea83c5aa7dddcab38a17806bfa50bc3 - - https://github.com/dotnet/msbuild - 7c941d28e61c76de665b1e008ea34ea667cdfead + + https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted + 27f9d42f6ea83c5aa7dddcab38a17806bfa50bc3 - - https://github.com/dotnet/msbuild - 7c941d28e61c76de665b1e008ea34ea667cdfead + + https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted + 27f9d42f6ea83c5aa7dddcab38a17806bfa50bc3 @@ -111,13 +111,13 @@ https://github.com/dotnet/roslyn 85262f5f51be12867c1c2776d7a2be55251c04be - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef https://github.com/nuget/nuget.client @@ -200,9 +200,9 @@ https://github.com/microsoft/vstest c4d80397805bec06b354d20aeb1773e243c6add0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 + 77545d6fd5ca79bc08198fd6d8037c14843f14ad https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -228,70 +228,70 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cda1f825e91100518205f3d354bd8ea07c5ceac2 + 5ce68f29d66fae8adb0e78b44afbb09dc3cdfbb7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cda1f825e91100518205f3d354bd8ea07c5ceac2 + 5ce68f29d66fae8adb0e78b44afbb09dc3cdfbb7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cda1f825e91100518205f3d354bd8ea07c5ceac2 + 5ce68f29d66fae8adb0e78b44afbb09dc3cdfbb7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cda1f825e91100518205f3d354bd8ea07c5ceac2 + 5ce68f29d66fae8adb0e78b44afbb09dc3cdfbb7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5bf5c017e225debf2b431cf33d0e4fad03039032 + 3385cf1d42f4e488140452369a247a4a16183ce4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef https://github.com/dotnet/razor @@ -306,21 +306,21 @@ https://github.com/dotnet/razor 09ca88197916e545aefea53f16ed1b266644cde9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef https://github.com/dotnet/xdt @@ -437,9 +437,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ae1269bff83362236d0f3bd4c9302e6a1e9341c + fa4d80b76c2431a825be026f6bbabca63e1f42ef https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 9c8b3e8c79ff..2ca2f13704bc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,22 +51,22 @@ - 8.0.16 - 8.0.16-servicing.25215.6 - 8.0.16 + 8.0.17 + 8.0.17-servicing.25266.2 + 8.0.17 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.2 - 8.0.16 - 8.0.16-servicing.25215.6 + 8.0.17 + 8.0.17-servicing.25266.2 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.1 8.0.3 8.0.1 - 8.0.16 + 8.0.17 8.0.0 8.0.0 - 8.0.16 + 8.0.17 8.0.0 8.0.0 8.0.0 @@ -124,16 +124,16 @@ - 17.10.30 + 17.10.29 $(MicrosoftBuildPackageVersion) - $([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim()) + 17.8.29 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 17.10.30-servicing-25278-02 + 17.10.29-servicing-25223-08 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildTasksCorePackageVersion) @@ -169,13 +169,13 @@ - 8.0.16 - 8.0.16-servicing.25216.11 - 8.0.16-servicing.25216.11 - 8.0.16-servicing.25216.11 - 8.0.16-servicing.25216.11 - 8.0.16-servicing.25216.11 - 8.0.16 + 8.0.17 + 8.0.17-servicing.25266.9 + 8.0.17-servicing.25266.9 + 8.0.17-servicing.25266.9 + 8.0.17-servicing.25266.9 + 8.0.17-servicing.25266.9 + 8.0.17 @@ -185,7 +185,7 @@ - 8.0.16-servicing.25217.3 + 8.0.17-servicing.25266.9 @@ -229,7 +229,7 @@ - 8.0.16 + 8.0.17 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) diff --git a/src/Layout/tool_fsharp/tool_fsc.csproj b/src/Layout/tool_fsharp/tool_fsc.csproj index adb50eed038b..9143bb92843a 100644 --- a/src/Layout/tool_fsharp/tool_fsc.csproj +++ b/src/Layout/tool_fsharp/tool_fsc.csproj @@ -7,9 +7,10 @@ - - - + + + +