diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 266784afc..bfb97e00b 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -174,7 +174,7 @@ stages: _RuntimeIdentifier: '' _BuildArchitecture: 'x64' _TestArg: $(_NonWindowsTestArg) - Build_Debian_Stretch_Debug_x64: + Build_Debian_11_Debug_x64: _BuildConfig: Debug _DockerParameter: '--docker debian' _LinuxPortable: '' diff --git a/eng/Publishing.props b/eng/Publishing.props index 3d0751dd8..f564a94e3 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -78,12 +78,12 @@ - - - - - - + + + + + + https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - 5a41781eb69eb4721e736a99262dbd32b6bb55d4 + 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/test-templates - 5a41781eb69eb4721e736a99262dbd32b6bb55d4 + 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/test-templates - 5a41781eb69eb4721e736a99262dbd32b6bb55d4 + 45a41b353d078e4d1e5918246fddbacb452eb210 diff --git a/eng/Versions.props b/eng/Versions.props index e0f5b2162..16cbd9727 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,9 +8,9 @@ 7 0 3 - 00 + 02 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - rtm + servicing $(VersionMajor).$(VersionMinor) @@ -23,7 +23,7 @@ 30 32 17 - $([MSBuild]::Add($(VersionFeature), 17)) + $([MSBuild]::Add($(VersionFeature), 16)) @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23204.1 - 1.1.0-rc.23204.1 - 1.1.0-rc.23204.1 + 1.1.0-rc.23213.1 + 1.1.0-rc.23213.1 + 1.1.0-rc.23213.1 diff --git a/eng/docker/debian/Dockerfile b/eng/docker/debian/Dockerfile index ebafe9adb..e448844a4 100644 --- a/eng/docker/debian/Dockerfile +++ b/eng/docker/debian/Dockerfile @@ -4,7 +4,7 @@ # # Dockerfile that creates a container suitable to build dotnet-cli -FROM mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-20211001171226-047508b +FROM mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64 # Install the deb packaging toolchain we need to build debs RUN apt-get update \ @@ -17,7 +17,7 @@ RUN apt-get update \ # liblldb is needed so deb package build does not throw missing library info errors RUN apt-get update \ - && apt-get -y install liblldb-3.9 \ + && apt-get -y install liblldb-9 \ && rm -rf /var/lib/apt/lists/* # Misc Dependencies for build @@ -27,6 +27,10 @@ RUN rm -rf /var/lib/apt/lists/* && \ sudo && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* + +RUN apt-get update \ + && apt-get -y install python-is-python2 \ + && rm -rf /var/lib/apt/lists/* RUN localedef -c -i en_US -f UTF-8 en_US.UTF-8 diff --git a/eng/source-build-tarball-build-official.yml b/eng/source-build-tarball-build-official.yml index 5d396baab..aa1de43eb 100644 --- a/eng/source-build-tarball-build-official.yml +++ b/eng/source-build-tarball-build-official.yml @@ -11,10 +11,12 @@ resources: - release/* - internal/release/* exclude: - - release/6.0.3xx - - internal/release/6.0.3xx - - release/6.0.4xx - - internal/release/6.0.4xx + - release/7.0.2xx + - internal/release/7.0.2xx + - release/7.0.3xx + - internal/release/7.0.3xx + - release/7.0.4xx + - internal/release/7.0.4xx stages: - build diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index 593c7833e..bd443698c 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -354,4 +354,4 @@ index ------------ -./sdk/x.y.z/vstest.console.exe ./sdk/x.y.z/vstest.console.runtimeconfig.json ./sdk/x.y.z/zh-Hans/ - ./sdk/x.y.z/zh-Hans/dotnet.resources.dll + ./sdk/x.y.z/zh-Hans/dotnet.resources.dll \ No newline at end of file diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt index 9428e5b29..e29c81347 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt @@ -20,15 +20,6 @@ AssemblyAttribute - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - AssemblyAttribute diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index 9fb5965a4..bb7e250aa 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -225,6 +225,11 @@ $(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipPortableLinux.xml" + + + $(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipLinux.xml" + + $(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipOSX.xml" diff --git a/test/SdkTests/TestsToSkipLinux.xml b/test/SdkTests/TestsToSkipLinux.xml new file mode 100644 index 000000000..b2bfd698a --- /dev/null +++ b/test/SdkTests/TestsToSkipLinux.xml @@ -0,0 +1,10 @@ + + + + + +