diff --git a/NuGet.config b/NuGet.config index 944ae5b686..48c5b72a3d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,7 +8,6 @@ - diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0eb998d811..0101350c57 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -103,6 +103,8 @@ extends: enablePublishBuildAssets: true enablePublishUsingPipelines: $(_PublishUsingPipelines) enableSourceBuild: true + sourceBuildParameters: + enableInternalSources: true enableTelemetry: true helixRepo: dotnet/fsharp jobs: diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index a3c0b4e661..9588baeee1 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -28,6 +28,6 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a3b61734d4..65e73d5efe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,26 +7,26 @@ - + https://github.com/dotnet/msbuild - 0ca03f84b7848ce9d7d3e5d1f68c5e090efa4f30 + c192adbb5252264481e8c046a8e0694f7fc7855b - + https://github.com/dotnet/msbuild - 0ca03f84b7848ce9d7d3e5d1f68c5e090efa4f30 + c192adbb5252264481e8c046a8e0694f7fc7855b - + https://github.com/dotnet/msbuild - 0ca03f84b7848ce9d7d3e5d1f68c5e090efa4f30 + c192adbb5252264481e8c046a8e0694f7fc7855b - + https://github.com/dotnet/msbuild - 0ca03f84b7848ce9d7d3e5d1f68c5e090efa4f30 + c192adbb5252264481e8c046a8e0694f7fc7855b - + https://github.com/dotnet/msbuild - 0ca03f84b7848ce9d7d3e5d1f68c5e090efa4f30 + c192adbb5252264481e8c046a8e0694f7fc7855b https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 5ce287e802..954e381e25 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -102,7 +102,7 @@ 17.10.40152 17.10.526-pre-g1b474069f5 17.10.41 - 17.13.22 + 17.13.26 $(RoslynVersion) $(RoslynVersion) @@ -138,9 +138,9 @@ 15.0.25123-Dev15Preview - 17.13.22 - 17.13.22 - 17.13.22 + $(MicrosoftBuildVersion) + $(MicrosoftBuildVersion) + $(MicrosoftBuildVersion) $(VisualStudioEditorPackagesVersion) diff --git a/eng/build.sh b/eng/build.sh index 1263445973..892997057a 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -171,6 +171,13 @@ while [[ $# > 0 ]]; do tfm=$2 shift ;; + # nop implementations of runtime* args sourcebuild might pass in on internal builds + --runtimesourcefeed) + shift + ;; + --runtimesourcefeedkey) + shift + ;; /p:*) properties="$properties $1" ;;