Skip to content

Commit 993f15a

Browse files
BrennanConroyBrennanConroy
authored
Merge branch 'master' into merge/release/5.0-to-master
2 parents 818279f + f490dd2 commit 993f15a

File tree

75 files changed

+863
-853
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+863
-853
lines changed

‎eng/Version.Details.xml‎

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

‎eng/Versions.props‎

Lines changed: 73 additions & 73 deletions
Large diffs are not rendered by default.

‎src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.codegen.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1+
~~~~~~~~~~ ~~~~~~~~~~~~~~

‎src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
2-
<div class=" ">
1+
~~~~~~~~~~~ ~~~~~~~~~~~
2+
<div class="~~~~~~~~~~~~~~~~">
33
Hello world
4-
4+
~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~
55
</div>
66

7-
8-
9-
7+
~~~~~~~~~~ ~
8+
~~~~ ~~~~~~~~~~~~~~~~~~~~~~ ~
9+
~

‎src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<div class=" ">
1+
<div class="~~~~~~~~~~~~~~~~">
22
Hello world
3-
3+
~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~
44
</div>
5-
6-
7-
8-
<p class=" " />
5+
~~
6+
~~~ ~~~ ~ ~~~~~~
7+
~
8+
<p class="~~~~~~~ ~~ ~~~~~ ~ ~~~~ ~" />

‎src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
1+
~~ ~~~~~ ~~~~ ~~~~~ ~~~~~~~~ ~~~~ ~~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~ ~~~~~~ ~~
22

3-
4-
5-
"
3+
~~~~~
4+
~~~~~
5+
~~~~~ "
66

7-
8-
7+
~~~~~~
8+
~~~~~~
99

10-
11-
12-
10+
~~~~~~~
11+
~~~~~~~
12+
~~~~~~~ ~~~~~~~~~~~~~~~~~
1313

14-
15-
14+
~~~~~~~~~~
15+
~~~~~~~~~~

‎src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
2-
1+
~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~
2+
~~~~~~ ~~~~~~~

‎src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
2-
1+
~~~~~
2+
~~~~~~ ~~~~~~~

‎src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
2-
3-
1+
~~~~~~ ~~~~~~~
2+
~~~~~~~ ~~~~~ ~~~~~~~~~~~~~~
3+
~~~~~~~ ~~~~~~~~~~~~~~~~~ ~~~~

‎src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
2-
3-
4-
5-
1+
~~~~~~ ~~~~~~~
2+
~~~~~~~ ~~~~~ ~~~~~~~~~~~~~~~
3+
~~~~~~~ ~~~~~~~~~~~~~~~~~ ~~~~~
4+
~~~~~~~ ~~~~~ ~~~~~~~~~~~~~~~ ~
5+
~~~~~~~ ~~~~~~~~~~~~~~~~~ ~~~~~ ~

0 commit comments

Comments
 (0)